Skip to content

D
dbeaver

suliangchun / dbeaver
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
D
dbeaver

体验新版 GitCode，发现更多精彩内容 >>

提交 f396e22f 编写于 作者: S Serge Rider
浏览文件
操作

Typo fix 


Former-commit-id: 3b66bca8
上级 9f1754db
隐藏空白更改
内联 并排
Showing with 57 addition and 57 deletion
plugins/org.jkiss.dbeaver.ext.generic/plugin.properties
浏览文件 @ f396e22f
......@@ -58,7 +58,7 @@ meta.org.jkiss.dbeaver.ext.generic.model.GenericTableColumn.inUniqueKey.name=Key
meta.org.jkiss.dbeaver.ext.generic.model.GenericTableColumn.description.name=Description
meta.org.jkiss.dbeaver.ext.generic.model.GenericTableConstraintColumn.ordinalPosition.name=Position
meta.org.jkiss.dbeaver.ext.generic.model.GenericTableConstraintColumn.attribute.name=Column
meta.org.jkiss.dbeaver.ext.generic.model.GenericTableForeignKey.defferability.name=Defferability
meta.org.jkiss.dbeaver.ext.generic.model.GenericTableForeignKey.deferability.name=Deferability
meta.org.jkiss.dbeaver.ext.generic.model.GenericTableForeignKeyColumnTable.referencedColumn.name=Reference Column
meta.org.jkiss.dbeaver.ext.generic.model.GenericTableIndex.description.name=Index Description
meta.org.jkiss.dbeaver.ext.generic.model.GenericTableIndex.unique.name=Unique
......
plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/edit/GenericForeignKeyManager.java
浏览文件 @ f396e22f
......@@ -24,7 +24,7 @@ import org.jkiss.dbeaver.model.impl.DBSObjectCache;
import org.jkiss.dbeaver.model.impl.sql.edit.struct.SQLForeignKeyManager;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.model.struct.rdb.DBSForeignKeyDefferability;
import org.jkiss.dbeaver.model.struct.rdb.DBSForeignKeyDeferability;
import org.jkiss.dbeaver.model.struct.rdb.DBSForeignKeyModifyRule;
import org.jkiss.dbeaver.ui.UITask;
import org.jkiss.dbeaver.ui.editors.object.struct.EditForeignKeyPage;
......@@ -67,7 +67,7 @@ public class GenericForeignKeyManager extends SQLForeignKeyManager<GenericTableF
(GenericPrimaryKey) editPage.getUniqueConstraint(),
editPage.getOnDeleteRule(),
editPage.getOnUpdateRule(),
DBSForeignKeyDefferability.NOT_DEFERRABLE,
DBSForeignKeyDeferability.NOT_DEFERRABLE,
false);
foreignKey.setName(DBObjectNameCaseTransformer.transformObjectName(foreignKey,
CommonUtils.escapeIdentifier(table.getName()) + "_" +
......
plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/ForeignKeysCache.java
浏览文件 @ f396e22f
......@@ -31,7 +31,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils;
import org.jkiss.dbeaver.model.impl.jdbc.cache.JDBCCompositeCache;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSEntityConstraintType;
import org.jkiss.dbeaver.model.struct.rdb.DBSForeignKeyDefferability;
import org.jkiss.dbeaver.model.struct.rdb.DBSForeignKeyDeferability;
import org.jkiss.dbeaver.model.struct.rdb.DBSForeignKeyModifyRule;
import org.jkiss.utils.CommonUtils;
......@@ -91,16 +91,16 @@ class ForeignKeysCache extends JDBCCompositeCache<GenericStructContainer, Generi
int updateRuleNum = GenericUtils.safeGetInt(foreignKeyObject, dbResult, JDBCConstants.UPDATE_RULE);
int deleteRuleNum = GenericUtils.safeGetInt(foreignKeyObject, dbResult, JDBCConstants.DELETE_RULE);
String pkName = GenericUtils.safeGetStringTrimmed(foreignKeyObject, dbResult, JDBCConstants.PK_NAME);
int defferabilityNum = GenericUtils.safeGetInt(foreignKeyObject, dbResult, JDBCConstants.DEFERRABILITY);
int deferabilityNum = GenericUtils.safeGetInt(foreignKeyObject, dbResult, JDBCConstants.DEFERRABILITY);
DBSForeignKeyModifyRule deleteRule = JDBCUtils.getCascadeFromNum(deleteRuleNum);
DBSForeignKeyModifyRule updateRule = JDBCUtils.getCascadeFromNum(updateRuleNum);
DBSForeignKeyDefferability defferability;
switch (defferabilityNum) {
case DatabaseMetaData.importedKeyInitiallyDeferred: defferability = DBSForeignKeyDefferability.INITIALLY_DEFERRED; break;
case DatabaseMetaData.importedKeyInitiallyImmediate: defferability = DBSForeignKeyDefferability.INITIALLY_IMMEDIATE; break;
case DatabaseMetaData.importedKeyNotDeferrable: defferability = DBSForeignKeyDefferability.NOT_DEFERRABLE; break;
default: defferability = DBSForeignKeyDefferability.UNKNOWN; break;
DBSForeignKeyDeferability deferability;
switch (deferabilityNum) {
case DatabaseMetaData.importedKeyInitiallyDeferred: deferability = DBSForeignKeyDeferability.INITIALLY_DEFERRED; break;
case DatabaseMetaData.importedKeyInitiallyImmediate: deferability = DBSForeignKeyDeferability.INITIALLY_IMMEDIATE; break;
case DatabaseMetaData.importedKeyNotDeferrable: deferability = DBSForeignKeyDeferability.NOT_DEFERRABLE; break;
default: deferability = DBSForeignKeyDeferability.UNKNOWN; break;
}
if (pkTableName == null) {
......@@ -163,7 +163,7 @@ class ForeignKeysCache extends JDBCCompositeCache<GenericStructContainer, Generi
// [JDBC] Some drivers return empty foreign key names
fkName = parent.getName().toUpperCase() + "_FK_" + pkTable.getName().toUpperCase(Locale.ENGLISH);
}
return new GenericTableForeignKey(parent, fkName, null, pk, deleteRule, updateRule, defferability, true);
return new GenericTableForeignKey(parent, fkName, null, pk, deleteRule, updateRule, deferability, true);
}
@Nullable
......
plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericTable.java
浏览文件 @ f396e22f
......@@ -37,7 +37,7 @@ import org.jkiss.dbeaver.model.meta.Property;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSEntityConstraintType;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.model.struct.rdb.DBSForeignKeyDefferability;
import org.jkiss.dbeaver.model.struct.rdb.DBSForeignKeyDeferability;
import org.jkiss.dbeaver.model.struct.rdb.DBSForeignKeyModifyRule;
import org.jkiss.utils.CommonUtils;
......@@ -302,7 +302,7 @@ public class GenericTable extends JDBCTable<GenericDataSource, GenericStructCont
int deleteRuleNum;
String fkName;
String pkName;
int defferabilityNum;
int deferabilityNum;
}
private synchronized List<GenericTableForeignKey> loadReferences(DBRProgressMonitor monitor)
......@@ -335,7 +335,7 @@ public class GenericTable extends JDBCTable<GenericDataSource, GenericStructCont
fkInfo.deleteRuleNum = GenericUtils.safeGetInt(fkObject, dbResult, JDBCConstants.DELETE_RULE);
fkInfo.fkName = GenericUtils.safeGetStringTrimmed(fkObject, dbResult, JDBCConstants.FK_NAME);
fkInfo.pkName = GenericUtils.safeGetStringTrimmed(fkObject, dbResult, JDBCConstants.PK_NAME);
fkInfo.defferabilityNum = GenericUtils.safeGetInt(fkObject, dbResult, JDBCConstants.DEFERRABILITY);
fkInfo.deferabilityNum = GenericUtils.safeGetInt(fkObject, dbResult, JDBCConstants.DEFERRABILITY);
fkInfos.add(fkInfo);
}
}
......@@ -345,12 +345,12 @@ public class GenericTable extends JDBCTable<GenericDataSource, GenericStructCont
for (ForeignKeyInfo info : fkInfos) {
DBSForeignKeyModifyRule deleteRule = JDBCUtils.getCascadeFromNum(info.deleteRuleNum);
DBSForeignKeyModifyRule updateRule = JDBCUtils.getCascadeFromNum(info.updateRuleNum);
DBSForeignKeyDefferability defferability;
switch (info.defferabilityNum) {
case DatabaseMetaData.importedKeyInitiallyDeferred: defferability = DBSForeignKeyDefferability.INITIALLY_DEFERRED; break;
case DatabaseMetaData.importedKeyInitiallyImmediate: defferability = DBSForeignKeyDefferability.INITIALLY_IMMEDIATE; break;
case DatabaseMetaData.importedKeyNotDeferrable: defferability = DBSForeignKeyDefferability.NOT_DEFERRABLE; break;
default: defferability = DBSForeignKeyDefferability.UNKNOWN; break;
DBSForeignKeyDeferability deferability;
switch (info.deferabilityNum) {
case DatabaseMetaData.importedKeyInitiallyDeferred: deferability = DBSForeignKeyDeferability.INITIALLY_DEFERRED; break;
case DatabaseMetaData.importedKeyInitiallyImmediate: deferability = DBSForeignKeyDeferability.INITIALLY_IMMEDIATE; break;
case DatabaseMetaData.importedKeyNotDeferrable: deferability = DBSForeignKeyDeferability.NOT_DEFERRABLE; break;
default: deferability = DBSForeignKeyDeferability.UNKNOWN; break;
}
if (info.fkTableName == null) {
......@@ -423,7 +423,7 @@ public class GenericTable extends JDBCTable<GenericDataSource, GenericStructCont
if (fk == null) {
fk = fkMap.get(info.fkName);
if (fk == null) {
fk = new GenericTableForeignKey(fkTable, info.fkName, null, pk, deleteRule, updateRule, defferability, true);
fk = new GenericTableForeignKey(fkTable, info.fkName, null, pk, deleteRule, updateRule, deferability, true);
fkMap.put(info.fkName, fk);
fkList.add(fk);
}
......
plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericTableForeignKey.java
浏览文件 @ f396e22f
......@@ -23,7 +23,7 @@ import org.jkiss.dbeaver.model.DBUtils;
import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableForeignKey;
import org.jkiss.dbeaver.model.meta.Property;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.struct.rdb.DBSForeignKeyDefferability;
import org.jkiss.dbeaver.model.struct.rdb.DBSForeignKeyDeferability;
import org.jkiss.dbeaver.model.struct.rdb.DBSForeignKeyModifyRule;
import org.jkiss.utils.CommonUtils;
......@@ -35,7 +35,7 @@ import java.util.List;
*/
public class GenericTableForeignKey extends JDBCTableForeignKey<GenericTable, GenericPrimaryKey>
{
private DBSForeignKeyDefferability defferability;
private DBSForeignKeyDeferability deferability;
private List<GenericTableForeignKeyColumnTable> columns;
public GenericTableForeignKey(
......@@ -45,11 +45,11 @@ public class GenericTableForeignKey extends JDBCTableForeignKey<GenericTable, Ge
GenericPrimaryKey referencedKey,
DBSForeignKeyModifyRule deleteRule,
DBSForeignKeyModifyRule updateRule,
DBSForeignKeyDefferability defferability,
DBSForeignKeyDeferability deferability,
boolean persisted)
{
super(table, name, remarks, referencedKey, deleteRule, updateRule, persisted);
this.defferability = defferability;
this.deferability = deferability;
}
@NotNull
......@@ -60,9 +60,9 @@ public class GenericTableForeignKey extends JDBCTableForeignKey<GenericTable, Ge
}
@Property(viewable = true, order = 7)
public DBSForeignKeyDefferability getDefferability()
public DBSForeignKeyDeferability getDeferability()
{
return defferability;
return deferability;
}
@Override
......
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/struct/rdb/DBSForeignKeyDefferability.java → plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/struct/rdb/DBSForeignKeyDeferability.java
浏览文件 @ f396e22f
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jkiss.dbeaver.model.struct.rdb;
/**
* DBSForeignKeyModifyRule
*/
public enum DBSForeignKeyDefferability
{
UNKNOWN,
INITIALLY_DEFERRED,
INITIALLY_IMMEDIATE,
NOT_DEFERRABLE,
}
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jkiss.dbeaver.model.struct.rdb;
/**
* DBSForeignKeyModifyRule
*/
public enum DBSForeignKeyDeferability
{
UNKNOWN,
INITIALLY_DEFERRED,
INITIALLY_IMMEDIATE,
NOT_DEFERRABLE,
}
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或