dbeaver/dbeaver#10533 SQL Dialect - dialect id to constructor added

Former-commit-id: 293118db

plugins/org.jkiss.dbeaver.ext.athena/src/org/jkiss/dbeaver/ext/athena/model/AthenaSQLDialect.java

@@ -23,6 +23,6 @@ import org.jkiss.dbeaver.ext.generic.model.GenericSQLDialect;
  */
 public class AthenaSQLDialect extends GenericSQLDialect {
     public AthenaSQLDialect() {
-        super("Athena");
+        super("Athena", "aws_athena");
     }
 }

plugins/org.jkiss.dbeaver.ext.bigquery/src/org/jkiss/dbeaver/ext/bigquery/model/BigQuerySQLDialect.java

@@ -23,6 +23,6 @@ import org.jkiss.dbeaver.ext.generic.model.GenericSQLDialect;
  */
 public class BigQuerySQLDialect extends GenericSQLDialect {
     public BigQuerySQLDialect() {
-        super("BigQuery");
+        super("BigQuery", "google_bigquery");
     }
 }

plugins/org.jkiss.dbeaver.ext.clickhouse/src/org/jkiss/dbeaver/ext/clickhouse/model/ClickhouseSQLDialect.java

@@ -23,7 +23,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCDataSource;
 public class ClickhouseSQLDialect extends GenericSQLDialect {
 
     public ClickhouseSQLDialect() {
-        super("Clickhouse SQL");
+        super("Clickhouse SQL", "clickhouse");
     }
 
     @Override

plugins/org.jkiss.dbeaver.ext.db2.i/src/org/jkiss/dbeaver/ext/db2/i/model/DB2ISQLDialect.java

@@ -23,7 +23,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCDataSource;
 public class DB2ISQLDialect extends GenericSQLDialect {
 
     public DB2ISQLDialect() {
-        super("IBM DB2 i");
+        super("IBM DB2 i", "db2_i");
     }
 
     @Override

plugins/org.jkiss.dbeaver.ext.db2.zos/src/org/jkiss/dbeaver/ext/db2/zos/model/DB2ZOSSQLDialect.java

@@ -23,7 +23,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCDataSource;
 public class DB2ZOSSQLDialect extends GenericSQLDialect {
 
     public DB2ZOSSQLDialect() {
-        super("DB2 for z/OS");
+        super("DB2 for z/OS", "db2_zos");
     }
 
     @Override

plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/DB2SQLDialect.java

@@ -40,7 +40,7 @@ public class DB2SQLDialect extends JDBCSQLDialect {
     };
 
     public DB2SQLDialect() {
-        super("DB2 LUW");
+        super("DB2 LUW", "db2_luw");
     }
 
     public void initDriverSettings(JDBCDataSource dataSource, JDBCDatabaseMetaData metaData) {

plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/ExasolSQLDialect.java

@@ -45,7 +45,7 @@ public class ExasolSQLDialect extends JDBCSQLDialect {
 
 
     public ExasolSQLDialect() {
-        super("Exasol");
+        super("Exasol", "exasol");
     }
     
     public void addExtraFunctions(String... functions) {

plugins/org.jkiss.dbeaver.ext.firebird/src/org/jkiss/dbeaver/ext/firebird/model/FireBirdSQLDialect.java

@@ -40,7 +40,7 @@ public class FireBirdSQLDialect extends GenericSQLDialect {
     };
 
     public FireBirdSQLDialect() {
-        super("Firebird");
+        super("Firebird", "firebird");
     }
 
     @NotNull

plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericSQLDialect.java

@@ -50,11 +50,11 @@ public class GenericSQLDialect extends JDBCSQLDialect {
     private boolean callableQueryInBrackets;
 
     public GenericSQLDialect() {
-        super("Generic");
+        super("Generic", "generic");
     }
 
-    protected GenericSQLDialect(String name) {
-        super(name);
+    protected GenericSQLDialect(String name, String id) {
+        super(name, id);
     }
 
     public void initDriverSettings(JDBCDataSource dataSource, JDBCDatabaseMetaData metaData) {

plugins/org.jkiss.dbeaver.ext.h2/src/org/jkiss/dbeaver/ext/h2/model/H2SQLDialect.java

@@ -27,7 +27,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCDataSource;
 public class H2SQLDialect extends GenericSQLDialect {
 
     public H2SQLDialect() {
-        super("H2");
+        super("H2", "h2");
     }
 
     public void initDriverSettings(JDBCDataSource dataSource, JDBCDatabaseMetaData metaData) {

plugins/org.jkiss.dbeaver.ext.hana/src/org/jkiss/dbeaver/ext/hana/model/HANASQLDialect.java

@@ -42,7 +42,7 @@ public class HANASQLDialect extends GenericSQLDialect {
     };
 
     public HANASQLDialect() {
-        super("HANA");
+        super("HANA", "sap_hana");
     }
 
     @Override

plugins/org.jkiss.dbeaver.ext.hive/src/org/jkiss/dbeaver/ext/hive/model/HiveSQLDialect.java

@@ -27,7 +27,7 @@ public class HiveSQLDialect extends GenericSQLDialect {
     private static final String[][] DEFAULT_QUOTE_STRINGS = {{"`", "`"}};
 
     public HiveSQLDialect() {
-        super("HiveQL");
+        super("HiveQL", "hive");
     }
 
     private static final String[] RESERVED_KEYWORDS = {

plugins/org.jkiss.dbeaver.ext.hsqldb/src/org/jkiss/dbeaver/ext/hsqldb/model/HSQLDialect.java

@@ -25,7 +25,7 @@ import java.util.Arrays;
 public class HSQLDialect extends GenericSQLDialect {
 
     public HSQLDialect() {
-        super("HSQLDB");
+        super("HSQLDB", "hsqldb");
     }
 
     public void initDriverSettings(JDBCDataSource dataSource, JDBCDatabaseMetaData metaData) {

plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerDialect.java

@@ -91,7 +91,7 @@ public class SQLServerDialect extends JDBCSQLDialect {
     private boolean isSqlServer;
 
     public SQLServerDialect() {
-        super("SQLServer");
+        super("SQLServer", "sqlserver");
     }
 
     public void initDriverSettings(JDBCDataSource dataSource, JDBCDatabaseMetaData metaData) {

plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLDialect.java

@@ -108,7 +108,7 @@ class MySQLDialect extends JDBCSQLDialect {
     private int lowerCaseTableNames;
 
     public MySQLDialect() {
-        super("MySQL");
+        super("MySQL", "mysql");
     }
 
     public void initDriverSettings(JDBCDataSource dataSource, JDBCDatabaseMetaData metaData) {

plugins/org.jkiss.dbeaver.ext.ocient/src/org/jkiss/dbeaver/ext/ocient/model/OcientSQLDialect.java

@@ -21,6 +21,6 @@ import org.jkiss.dbeaver.ext.generic.model.GenericSQLDialect;
 public class OcientSQLDialect extends GenericSQLDialect {
 
     public OcientSQLDialect() {
-	super("Ocient SQL");
+	super("Ocient SQL", "ocient");
     }
 }

plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleSQLDialect.java

@@ -110,7 +110,7 @@ public class OracleSQLDialect extends JDBCSQLDialect {
     private DBPPreferenceStore preferenceStore;
 
     public OracleSQLDialect() {
-        super("Oracle");
+        super("Oracle", "oracle");
     }
 
     public void initDriverSettings(JDBCDataSource dataSource, JDBCDatabaseMetaData metaData) {

plugins/org.jkiss.dbeaver.ext.phoenix/src/org/jkiss/dbeaver/ext/phoenix/model/PhoenixSQLDialect.java

@@ -24,7 +24,7 @@ import org.jkiss.dbeaver.model.sql.SQLDialect;
 public class PhoenixSQLDialect extends GenericSQLDialect {
 
     public PhoenixSQLDialect() {
-        super("Phoenix");
+        super("Phoenix", "apache_phoenix");
     }
 
     public void initDriverSettings(JDBCDataSource dataSource, JDBCDatabaseMetaData metaData) {

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDialect.java

@@ -662,7 +662,7 @@ public class PostgreDialect extends JDBCSQLDialect implements TPRuleProvider {
 
 
     public PostgreDialect() {
-        super("PostgreSQL");
+        super("PostgreSQL", "postgresql");
     }
 
     public void addExtraKeywords(String... keywords) {

plugins/org.jkiss.dbeaver.ext.snowflake.core/src/org/jkiss/dbeaver/ext/snowflake/model/SnowflakeSQLDialect.java

@@ -32,7 +32,7 @@ import java.util.List;
 public class SnowflakeSQLDialect extends GenericSQLDialect implements TPRuleProvider {
 
     public SnowflakeSQLDialect() {
-        super("Snowflake");
+        super("Snowflake", "snowflake");
     }
 
     public void initDriverSettings(JDBCDataSource dataSource, JDBCDatabaseMetaData metaData) {

plugins/org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/model/SpannerSQLDialect.java

@@ -23,7 +23,7 @@ import org.jkiss.dbeaver.ext.generic.model.GenericSQLDialect;
  */
 public class SpannerSQLDialect extends GenericSQLDialect {
     public SpannerSQLDialect() {
-        super("Spanner");
+        super("Spanner", "spanner");
     }
 
 	@Override

plugins/org.jkiss.dbeaver.ext.sqlite/src/org/jkiss/dbeaver/ext/sqlite/model/SQLiteSQLDialect.java

@@ -24,7 +24,7 @@ import org.jkiss.dbeaver.model.impl.sql.BasicSQLDialect;
 public class SQLiteSQLDialect extends GenericSQLDialect {
 
     public SQLiteSQLDialect() {
-        super("SQLite");
+        super("SQLite", "sqlite");
     }
 
     public void initDriverSettings(JDBCDataSource dataSource, JDBCDatabaseMetaData metaData) {

plugins/org.jkiss.dbeaver.ext.teradata/src/org/jkiss/dbeaver/ext/teradata/model/TeradataSQLDialect.java

@@ -25,7 +25,7 @@ import java.util.Arrays;
 public class TeradataSQLDialect extends GenericSQLDialect {
 
     public TeradataSQLDialect() {
-        super("Teradata");
+        super("Teradata", "teradata");
     }
 
     public void initDriverSettings(JDBCDataSource dataSource, JDBCDatabaseMetaData metaData) {

plugins/org.jkiss.dbeaver.ext.vertica/src/org/jkiss/dbeaver/ext/vertica/model/VerticaSQLDialect.java

@@ -24,7 +24,7 @@ import org.jkiss.dbeaver.model.impl.sql.BasicSQLDialect;
 public class VerticaSQLDialect extends GenericSQLDialect {
 
     public VerticaSQLDialect() {
-        super("Vertica");
+        super("Vertica", "vertica");
     }
 
     public void initDriverSettings(JDBCDataSource dataSource, JDBCDatabaseMetaData metaData) {

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCSQLDialect.java

@@ -42,6 +42,7 @@ public class JDBCSQLDialect extends BasicSQLDialect {
     private static final Log log = Log.getLog(JDBCSQLDialect.class);
 
     private String name;
+    private String id;
     private String[][] identifierQuoteString = new String[][]{{SQLConstants.DEFAULT_IDENTIFIER_QUOTE, SQLConstants.DEFAULT_IDENTIFIER_QUOTE}};
     private SQLStateType sqlStateType;
     private String searchStringEscape;
@@ -60,8 +61,9 @@ public class JDBCSQLDialect extends BasicSQLDialect {
 
     private transient boolean typesLoaded = false;
 
-    public JDBCSQLDialect(String name) {
+    public JDBCSQLDialect(String name, String id) {
         this.name = name;
+        this.id = id;
     }
 
     public void initDriverSettings(JDBCDataSource dataSource, JDBCDatabaseMetaData metaData) {
@@ -210,6 +212,12 @@ public class JDBCSQLDialect extends BasicSQLDialect {
         return name;
     }
 
+    @NotNull
+    @Override
+    public String getDialectId() {
+        return id;
+    }
+
     @Nullable
     @Override
     public String[][] getIdentifierQuoteStrings() {

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/BasicSQLDialect.java

@@ -75,6 +75,12 @@ public class BasicSQLDialect extends AbstractSQLDialect implements RelationalSQL
         loadStandardKeywords();
     }
 
+    @NotNull
+    @Override
+    public String getDialectId() {
+        return ID;
+    }
+
     @NotNull
     @Override
     public String getDialectName() {

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLDialect.java

@@ -55,6 +55,9 @@ public interface SQLDialect {
         INSERT_ALL
     }
 
+    @NotNull
+    String getDialectId();
+
     /**
      * Dialect name
      * @return SQL dialect name

test/org.jkiss.dbeaver.ext.test/src/org/jkiss/dbeaver/ext/test/swtbot/SWTbotTest.java

@@ -17,7 +17,7 @@
 package org.jkiss.dbeaver.ext.test.swtbot;
 
 
-import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
+/*import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -69,4 +69,4 @@ public class SWTbotTest {
 
     }
     
-}
+}*/