{
+ UIUtils.syncExec(() -> {
updateObjectPermissions(null);
});
activatePart();
diff --git a/plugins/org.jkiss.dbeaver.ext.sample.database/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.sample.database/META-INF/MANIFEST.MF
index 46f7438b3191f42af5023954ead9dce9e5e4efa2..734247c8f0848a5e091b87060b5f7e92c820139f 100644
--- a/plugins/org.jkiss.dbeaver.ext.sample.database/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.sample.database/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.ext.sample.database;singleton:=true
-Bundle-Version: 1.0.21
-Bundle-Release-Date: 20180528
+Bundle-Version: 1.0.22
+Bundle-Release-Date: 20180604
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.jkiss.dbeaver.core,
diff --git a/plugins/org.jkiss.dbeaver.ext.sample.database/pom.xml b/plugins/org.jkiss.dbeaver.ext.sample.database/pom.xml
index c62a09ab716c1c6280f1ccbcef6d1497b36c80eb..6e753f2e9eb29c319c563d269283e44eabcd2a41 100644
--- a/plugins/org.jkiss.dbeaver.ext.sample.database/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.sample.database/pom.xml
@@ -9,6 +9,6 @@
keyPattern = ((BigInteger) keyPattern).subtract(BigInteger.valueOf(gapSize));
} else if (keyPattern instanceof BigDecimal) {
keyPattern = ((BigDecimal) keyPattern).subtract(new BigDecimal(gapSize));
+ } else if (keyPattern instanceof String) {
+ keyPattern = Double.parseDouble((String) keyPattern) - gapSize;
+ }
+ } else if (keyPattern instanceof CharSequence) {
+ if (((CharSequence)keyPattern).length() > 0) {
+ keyPattern = "%" + keyPattern.toString() + "%";
+ } else {
+ keyPattern = null;
}
- } else {
- // not supported
- keyPattern = null;
}
}
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/BasicSQLDialect.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/BasicSQLDialect.java
index e4bed2ef170dfdb9780f04ae0257c6d1efb6634f..c1d84c72b895ab827a97cd47bd02cc6847ed587b 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/BasicSQLDialect.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/BasicSQLDialect.java
@@ -49,7 +49,10 @@ public class BasicSQLDialect implements SQLDialect {
};
private static final String[][] DEFAULT_BEGIN_END_BLOCK = new String[][]{
- {SQLConstants.BLOCK_BEGIN, SQLConstants.BLOCK_END}
+ {
+ SQLConstants.BLOCK_BEGIN,
+ SQLConstants.BLOCK_END
+ }
};
protected static final String[] NON_TRANSACTIONAL_KEYWORDS = new String[]{
//SQLConstants.KEYWORD_SELECT, "WITH",
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLIndexManager.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLIndexManager.java
index 28c4e876f921f1c6a5a59f1171b51715844fd556..f21c67f7af9ef296f175c4144f371f8d40d565cf 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLIndexManager.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLIndexManager.java
@@ -112,7 +112,7 @@ public abstract class SQLIndexManager