This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/main by this push:
new 03eaa3e642 Handle boolean and timestamp correctly in databaseMeta,
fixes #6268 (#6270)
03eaa3e642 is described below
commit 03eaa3e64288f190b886f6f1475cf640a6705742
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Mon Dec 29 15:22:22 2025 +0100
Handle boolean and timestamp correctly in databaseMeta, fixes #6268 (#6270)
---
.../apache/hop/databases/access/AccessDatabaseMeta.java | 7 ++-----
.../hop/databases/access/AccessDatabaseMetaTest.java | 1 +
.../hop/databases/clickhouse/ClickhouseDatabaseMeta.java | 10 +++++-----
.../databases/clickhouse/ClickhouseDatabaseMetaTest.java | 1 +
.../hop/databases/cratedb/CrateDBDatabaseMeta.java | 6 ++++++
.../hop/databases/cratedb/CrateDBDatabaseMetaTest.java | 1 +
.../apache/hop/databases/duckdb/DuckDBDatabaseMeta.java | 16 ++++++----------
.../hop/databases/firebird/FirebirdDatabaseMetaTest.java | 1 +
.../googlebigquery/GoogleBigQueryDatabaseMeta.java | 10 +++++-----
.../org/apache/hop/databases/h2/H2DatabaseMetaTest.java | 1 +
.../org/apache/hop/databases/hive/HiveDatabaseMeta.java | 2 --
.../apache/hop/databases/hive/HiveDatabaseMetaTest.java | 3 ++-
.../hop/databases/hypersonic/HypersonicDatabaseMeta.java | 5 +++++
.../databases/hypersonic/HypersonicDatabaseMetaTest.java | 2 ++
.../apache/hop/databases/impala/ImpalaDatabaseMeta.java | 5 +++++
.../hop/databases/informix/InformixDatabaseMeta.java | 5 +++++
.../hop/databases/informix/InformixDatabaseMetaTest.java | 1 +
.../hop/databases/kingbasees/KingbaseESDatabaseMeta.java | 5 +++++
.../databases/kingbasees/KingbaseESDatabaseMetaTest.java | 1 +
.../hop/databases/monetdb/MonetDBDatabaseMeta.java | 5 +++++
.../hop/databases/monetdb/MonetDBDatabaseMetaTest.java | 1 +
.../hop/databases/mssql/MsSqlServerDatabaseMeta.java | 5 +++++
.../hop/databases/mssql/MsSqlServerDatabaseMetaTest.java | 3 ++-
.../mssqlnative/MsSqlServerNativeDatabaseMeta.java | 12 ++----------
.../apache/hop/databases/mysql/MySqlDatabaseMeta.java | 15 ++-------------
.../hop/databases/mysql/MySqlDatabaseMetaTest.java | 1 +
.../apache/hop/databases/oracle/OracleDatabaseMeta.java | 10 +++-------
.../hop/databases/oracle/OracleDatabaseMetaTest.java | 1 +
.../hop/databases/postgresql/PostgreSqlDatabaseMeta.java | 16 ++++++----------
.../databases/postgresql/PostgreSqlDatabaseMetaTest.java | 1 +
.../databases/singlestore/SingleStoreDatabaseMeta.java | 15 ++-------------
.../singlestore/SingleStoreDatabaseMetaTest.java | 1 +
.../hop/databases/snowflake/SnowflakeDatabaseMeta.java | 10 +++++-----
.../databases/snowflake/SnowflakeDatabaseMetaTest.java | 1 +
.../hop/databases/sybase/SybaseDatabaseMetaTest.java | 1 +
.../hop/databases/sybaseiq/SybaseIQDatabaseMetaTest.java | 1 +
.../hop/databases/vertica/VerticaDatabaseMeta.java | 10 +++++-----
.../hop/databases/vertica/VerticaDatabaseMetaTest.java | 1 +
.../hop/database/databricks/DatabricksDatabaseMeta.java | 16 ++++++----------
39 files changed, 107 insertions(+), 102 deletions(-)
diff --git
a/plugins/databases/access/src/main/java/org/apache/hop/databases/access/AccessDatabaseMeta.java
b/plugins/databases/access/src/main/java/org/apache/hop/databases/access/AccessDatabaseMeta.java
index b8fdc031d3..93e0b62a6d 100644
---
a/plugins/databases/access/src/main/java/org/apache/hop/databases/access/AccessDatabaseMeta.java
+++
b/plugins/databases/access/src/main/java/org/apache/hop/databases/access/AccessDatabaseMeta.java
@@ -57,6 +57,8 @@ public class AccessDatabaseMeta extends BaseDatabaseMeta
implements IDatabase {
@Override
public void addDefaultOptions() {
addExtraOption(getPluginId(), "newDatabaseVersion", "V2010");
+ setSupportsBooleanDataType(true);
+ setSupportsTimestampDataType(true);
}
@Override
@@ -302,11 +304,6 @@ public class AccessDatabaseMeta extends BaseDatabaseMeta
implements IDatabase {
return false;
}
- @Override
- public boolean isSupportsBooleanDataType() {
- return true;
- }
-
@Override
public boolean isSupportsErrorHandling() {
return false;
diff --git
a/plugins/databases/access/src/test/java/org/apache/hop/databases/access/AccessDatabaseMetaTest.java
b/plugins/databases/access/src/test/java/org/apache/hop/databases/access/AccessDatabaseMetaTest.java
index 7e9a211037..62b2c9f46d 100644
---
a/plugins/databases/access/src/test/java/org/apache/hop/databases/access/AccessDatabaseMetaTest.java
+++
b/plugins/databases/access/src/test/java/org/apache/hop/databases/access/AccessDatabaseMetaTest.java
@@ -46,6 +46,7 @@ class AccessDatabaseMetaTest {
void setupOnce() throws Exception {
nativeMeta = new AccessDatabaseMeta();
nativeMeta.setAccessType(DatabaseMeta.TYPE_ACCESS_NATIVE);
+ nativeMeta.addDefaultOptions();
HopClientEnvironment.init();
}
diff --git
a/plugins/databases/clickhouse/src/main/java/org/apache/hop/databases/clickhouse/ClickhouseDatabaseMeta.java
b/plugins/databases/clickhouse/src/main/java/org/apache/hop/databases/clickhouse/ClickhouseDatabaseMeta.java
index 185eb8a030..6b14bfc9f8 100644
---
a/plugins/databases/clickhouse/src/main/java/org/apache/hop/databases/clickhouse/ClickhouseDatabaseMeta.java
+++
b/plugins/databases/clickhouse/src/main/java/org/apache/hop/databases/clickhouse/ClickhouseDatabaseMeta.java
@@ -312,11 +312,6 @@ public class ClickhouseDatabaseMeta extends
BaseDatabaseMeta implements IDatabas
return true;
}
- @Override
- public boolean isSupportsBooleanDataType() {
- return false;
- }
-
@Override
public boolean IsSupportsErrorHandlingOnBatchUpdates() {
return true;
@@ -460,4 +455,9 @@ public class ClickhouseDatabaseMeta extends
BaseDatabaseMeta implements IDatabas
public boolean isSupportsTimeStampToDateConversion() {
return false;
}
+
+ @Override
+ public void addDefaultOptions() {
+ setSupportsTimestampDataType(true);
+ }
}
diff --git
a/plugins/databases/clickhouse/src/test/java/org/apache/hop/databases/clickhouse/ClickhouseDatabaseMetaTest.java
b/plugins/databases/clickhouse/src/test/java/org/apache/hop/databases/clickhouse/ClickhouseDatabaseMetaTest.java
index 3197a4994f..0d50c04707 100644
---
a/plugins/databases/clickhouse/src/test/java/org/apache/hop/databases/clickhouse/ClickhouseDatabaseMetaTest.java
+++
b/plugins/databases/clickhouse/src/test/java/org/apache/hop/databases/clickhouse/ClickhouseDatabaseMetaTest.java
@@ -41,6 +41,7 @@ class ClickhouseDatabaseMetaTest {
void setupOnce() throws Exception {
nativeMeta = new ClickhouseDatabaseMeta();
nativeMeta.setAccessType(DatabaseMeta.TYPE_ACCESS_NATIVE);
+ nativeMeta.addDefaultOptions();
HopClientEnvironment.init();
}
diff --git
a/plugins/databases/cratedb/src/main/java/org/apache/hop/databases/cratedb/CrateDBDatabaseMeta.java
b/plugins/databases/cratedb/src/main/java/org/apache/hop/databases/cratedb/CrateDBDatabaseMeta.java
index f444f15eb8..80f2be459c 100644
---
a/plugins/databases/cratedb/src/main/java/org/apache/hop/databases/cratedb/CrateDBDatabaseMeta.java
+++
b/plugins/databases/cratedb/src/main/java/org/apache/hop/databases/cratedb/CrateDBDatabaseMeta.java
@@ -259,4 +259,10 @@ public class CrateDBDatabaseMeta extends
PostgreSqlDatabaseMeta {
public String getSqlUnlockTables(String[] tableName) {
throw new UnsupportedOperationException("CrateDB does not support locking
tables");
}
+
+ @Override
+ public void addDefaultOptions() {
+ setSupportsBooleanDataType(true);
+ setSupportsTimestampDataType(true);
+ }
}
diff --git
a/plugins/databases/cratedb/src/test/java/org/apache/hop/databases/cratedb/CrateDBDatabaseMetaTest.java
b/plugins/databases/cratedb/src/test/java/org/apache/hop/databases/cratedb/CrateDBDatabaseMetaTest.java
index 7de0026f15..8994881c9b 100644
---
a/plugins/databases/cratedb/src/test/java/org/apache/hop/databases/cratedb/CrateDBDatabaseMetaTest.java
+++
b/plugins/databases/cratedb/src/test/java/org/apache/hop/databases/cratedb/CrateDBDatabaseMetaTest.java
@@ -43,6 +43,7 @@ class CrateDBDatabaseMetaTest {
void setupBefore() {
nativeMeta = new CrateDBDatabaseMeta();
nativeMeta.setAccessType(DatabaseMeta.TYPE_ACCESS_NATIVE);
+ nativeMeta.addDefaultOptions();
}
@Test
diff --git
a/plugins/databases/duckdb/src/main/java/org/apache/hop/databases/duckdb/DuckDBDatabaseMeta.java
b/plugins/databases/duckdb/src/main/java/org/apache/hop/databases/duckdb/DuckDBDatabaseMeta.java
index 9f09de2afc..686beeec0e 100644
---
a/plugins/databases/duckdb/src/main/java/org/apache/hop/databases/duckdb/DuckDBDatabaseMeta.java
+++
b/plugins/databases/duckdb/src/main/java/org/apache/hop/databases/duckdb/DuckDBDatabaseMeta.java
@@ -190,16 +190,6 @@ public class DuckDBDatabaseMeta extends BaseDatabaseMeta
implements IDatabase {
+ getFieldDefinition(v, tk, pk, useAutoIncrement, false, false);
}
- @Override
- public boolean isSupportsBooleanDataType() {
- return true;
- }
-
- @Override
- public boolean isSupportsTimestampDataType() {
- return true;
- }
-
@Override
public boolean isSupportsOptionsInURL() {
return false;
@@ -209,4 +199,10 @@ public class DuckDBDatabaseMeta extends BaseDatabaseMeta
implements IDatabase {
public String[] getTableTypes() {
return new String[] {"BASE TABLE", "LOCAL TEMPORARY"};
}
+
+ @Override
+ public void addDefaultOptions() {
+ setSupportsBooleanDataType(true);
+ setSupportsTimestampDataType(true);
+ }
}
diff --git
a/plugins/databases/firebird/src/test/java/org/apache/hop/databases/firebird/FirebirdDatabaseMetaTest.java
b/plugins/databases/firebird/src/test/java/org/apache/hop/databases/firebird/FirebirdDatabaseMetaTest.java
index 714a07e68d..76db86e347 100644
---
a/plugins/databases/firebird/src/test/java/org/apache/hop/databases/firebird/FirebirdDatabaseMetaTest.java
+++
b/plugins/databases/firebird/src/test/java/org/apache/hop/databases/firebird/FirebirdDatabaseMetaTest.java
@@ -42,6 +42,7 @@ class FirebirdDatabaseMetaTest {
void setupBefore() {
nativeMeta = new FirebirdDatabaseMeta();
nativeMeta.setAccessType(DatabaseMeta.TYPE_ACCESS_NATIVE);
+ nativeMeta.addDefaultOptions();
}
@Test
diff --git
a/plugins/databases/googlebigquery/src/main/java/org/apache/hop/databases/googlebigquery/GoogleBigQueryDatabaseMeta.java
b/plugins/databases/googlebigquery/src/main/java/org/apache/hop/databases/googlebigquery/GoogleBigQueryDatabaseMeta.java
index 805922a7fe..d1fd6bd536 100644
---
a/plugins/databases/googlebigquery/src/main/java/org/apache/hop/databases/googlebigquery/GoogleBigQueryDatabaseMeta.java
+++
b/plugins/databases/googlebigquery/src/main/java/org/apache/hop/databases/googlebigquery/GoogleBigQueryDatabaseMeta.java
@@ -185,11 +185,6 @@ public class GoogleBigQueryDatabaseMeta extends
BaseDatabaseMeta implements IDat
return false;
}
- @Override
- public boolean isSupportsBooleanDataType() {
- return true;
- }
-
@Override
public boolean isRequiringTransactionsOnQueries() {
return false;
@@ -340,4 +335,9 @@ public class GoogleBigQueryDatabaseMeta extends
BaseDatabaseMeta implements IDat
public String getUnsupportedTableOutputMessage() {
return BaseMessages.getString(PKG,
"GoogleBigQueryDatabaseMeta.UnsupportedTableOutputMessage");
}
+
+ @Override
+ public void addDefaultOptions() {
+ setSupportsBooleanDataType(true);
+ }
}
diff --git
a/plugins/databases/h2/src/test/java/org/apache/hop/databases/h2/H2DatabaseMetaTest.java
b/plugins/databases/h2/src/test/java/org/apache/hop/databases/h2/H2DatabaseMetaTest.java
index 50276118cd..7b44591143 100644
---
a/plugins/databases/h2/src/test/java/org/apache/hop/databases/h2/H2DatabaseMetaTest.java
+++
b/plugins/databases/h2/src/test/java/org/apache/hop/databases/h2/H2DatabaseMetaTest.java
@@ -41,6 +41,7 @@ class H2DatabaseMetaTest {
void setupBefore() {
nativeMeta = new H2DatabaseMeta();
nativeMeta.setAccessType(DatabaseMeta.TYPE_ACCESS_NATIVE);
+ nativeMeta.addDefaultOptions();
}
@Test
diff --git
a/plugins/databases/hive/src/main/java/org/apache/hop/databases/hive/HiveDatabaseMeta.java
b/plugins/databases/hive/src/main/java/org/apache/hop/databases/hive/HiveDatabaseMeta.java
index cc91e0e84d..07f97cb674 100644
---
a/plugins/databases/hive/src/main/java/org/apache/hop/databases/hive/HiveDatabaseMeta.java
+++
b/plugins/databases/hive/src/main/java/org/apache/hop/databases/hive/HiveDatabaseMeta.java
@@ -614,8 +614,6 @@ public class HiveDatabaseMeta extends BaseDatabaseMeta
implements IDatabase {
setForcingIdentifiersToLowerCase(true);
setSupportsTimestampDataType(true);
setSupportsBooleanDataType(true);
-
- // addExtraOption(getPluginId(), "option", "value");
}
@Override
diff --git
a/plugins/databases/hive/src/test/java/org/apache/hop/databases/hive/HiveDatabaseMetaTest.java
b/plugins/databases/hive/src/test/java/org/apache/hop/databases/hive/HiveDatabaseMetaTest.java
index 37db4688a3..35c61f2c60 100644
---
a/plugins/databases/hive/src/test/java/org/apache/hop/databases/hive/HiveDatabaseMetaTest.java
+++
b/plugins/databases/hive/src/test/java/org/apache/hop/databases/hive/HiveDatabaseMetaTest.java
@@ -75,6 +75,7 @@ class HiveDatabaseMetaTest {
void setupBefore() {
nativeMeta = new HiveDatabaseMeta();
nativeMeta.setAccessType(DatabaseMeta.TYPE_ACCESS_NATIVE);
+ nativeMeta.addDefaultOptions();
}
@Test
@@ -262,7 +263,7 @@ class HiveDatabaseMetaTest {
"FOO", new ValueMetaTimestamp("BAR"), "", false, "", false));
assertEquals(
- "ALTER TABLE FOO ADD BAR CHAR(1)",
+ "ALTER TABLE FOO ADD BAR BOOLEAN",
nativeMeta.getAddColumnStatement("FOO", new ValueMetaBoolean("BAR"),
"", false, "", false));
assertEquals(
diff --git
a/plugins/databases/hypersonic/src/main/java/org/apache/hop/databases/hypersonic/HypersonicDatabaseMeta.java
b/plugins/databases/hypersonic/src/main/java/org/apache/hop/databases/hypersonic/HypersonicDatabaseMeta.java
index f188f824f3..5871ff6534 100644
---
a/plugins/databases/hypersonic/src/main/java/org/apache/hop/databases/hypersonic/HypersonicDatabaseMeta.java
+++
b/plugins/databases/hypersonic/src/main/java/org/apache/hop/databases/hypersonic/HypersonicDatabaseMeta.java
@@ -599,4 +599,9 @@ public class HypersonicDatabaseMeta extends
BaseDatabaseMeta implements IDatabas
+ sequenceName
+ "'";
}
+
+ @Override
+ public void addDefaultOptions() {
+ setSupportsBooleanDataType(true);
+ }
}
diff --git
a/plugins/databases/hypersonic/src/test/java/org/apache/hop/databases/hypersonic/HypersonicDatabaseMetaTest.java
b/plugins/databases/hypersonic/src/test/java/org/apache/hop/databases/hypersonic/HypersonicDatabaseMetaTest.java
index f32202ffaa..610a54f2d5 100644
---
a/plugins/databases/hypersonic/src/test/java/org/apache/hop/databases/hypersonic/HypersonicDatabaseMetaTest.java
+++
b/plugins/databases/hypersonic/src/test/java/org/apache/hop/databases/hypersonic/HypersonicDatabaseMetaTest.java
@@ -46,7 +46,9 @@ class HypersonicDatabaseMetaTest {
public HypersonicDatabaseMetaTest() {
hypersonicDatabaseMeta = new HypersonicDatabaseMeta();
+ hypersonicDatabaseMeta.addDefaultOptions();
hypersonicDatabaseMetaQouting = new HypersonicDatabaseMeta();
+ hypersonicDatabaseMetaQouting.addDefaultOptions();
hypersonicDatabaseMetaQouting.setQuoteAllFields(true);
hypersonicDatabaseMetaUppercase = new HypersonicDatabaseMeta();
hypersonicDatabaseMetaUppercase.setForcingIdentifiersToUpperCase(true);
diff --git
a/plugins/databases/impala/src/main/java/org/apache/hop/databases/impala/ImpalaDatabaseMeta.java
b/plugins/databases/impala/src/main/java/org/apache/hop/databases/impala/ImpalaDatabaseMeta.java
index bd281949f0..1a26ea2992 100644
---
a/plugins/databases/impala/src/main/java/org/apache/hop/databases/impala/ImpalaDatabaseMeta.java
+++
b/plugins/databases/impala/src/main/java/org/apache/hop/databases/impala/ImpalaDatabaseMeta.java
@@ -248,4 +248,9 @@ public class ImpalaDatabaseMeta extends BaseDatabaseMeta
implements IDatabase {
public void setPrincipalName(String principalName) {
this.principalName = principalName;
}
+
+ @Override
+ public void addDefaultOptions() {
+ setSupportsBooleanDataType(true);
+ }
}
diff --git
a/plugins/databases/informix/src/main/java/org/apache/hop/databases/informix/InformixDatabaseMeta.java
b/plugins/databases/informix/src/main/java/org/apache/hop/databases/informix/InformixDatabaseMeta.java
index 2ad53dd81b..c8545d103d 100644
---
a/plugins/databases/informix/src/main/java/org/apache/hop/databases/informix/InformixDatabaseMeta.java
+++
b/plugins/databases/informix/src/main/java/org/apache/hop/databases/informix/InformixDatabaseMeta.java
@@ -286,4 +286,9 @@ public class InformixDatabaseMeta extends BaseDatabaseMeta
implements IDatabase
public boolean isInformixVariant() {
return true;
}
+
+ @Override
+ public void addDefaultOptions() {
+ setSupportsBooleanDataType(true);
+ }
}
diff --git
a/plugins/databases/informix/src/test/java/org/apache/hop/databases/informix/InformixDatabaseMetaTest.java
b/plugins/databases/informix/src/test/java/org/apache/hop/databases/informix/InformixDatabaseMetaTest.java
index ee2e906cb4..c593bb5709 100644
---
a/plugins/databases/informix/src/test/java/org/apache/hop/databases/informix/InformixDatabaseMetaTest.java
+++
b/plugins/databases/informix/src/test/java/org/apache/hop/databases/informix/InformixDatabaseMetaTest.java
@@ -42,6 +42,7 @@ class InformixDatabaseMetaTest {
void setupBefore() {
nativeMeta = new InformixDatabaseMeta();
nativeMeta.setAccessType(DatabaseMeta.TYPE_ACCESS_NATIVE);
+ nativeMeta.addDefaultOptions();
}
@Test
diff --git
a/plugins/databases/kingbasees/src/main/java/org/apache/hop/databases/kingbasees/KingbaseESDatabaseMeta.java
b/plugins/databases/kingbasees/src/main/java/org/apache/hop/databases/kingbasees/KingbaseESDatabaseMeta.java
index 342cf2ee7d..94fcedfdd4 100644
---
a/plugins/databases/kingbasees/src/main/java/org/apache/hop/databases/kingbasees/KingbaseESDatabaseMeta.java
+++
b/plugins/databases/kingbasees/src/main/java/org/apache/hop/databases/kingbasees/KingbaseESDatabaseMeta.java
@@ -987,4 +987,9 @@ public class KingbaseESDatabaseMeta extends
BaseDatabaseMeta implements IDatabas
public boolean isSupportsTimeStampToDateConversion() {
return false;
}
+
+ @Override
+ public void addDefaultOptions() {
+ setSupportsBooleanDataType(true);
+ }
}
diff --git
a/plugins/databases/kingbasees/src/test/java/org/apache/hop/databases/kingbasees/KingbaseESDatabaseMetaTest.java
b/plugins/databases/kingbasees/src/test/java/org/apache/hop/databases/kingbasees/KingbaseESDatabaseMetaTest.java
index de55254cf2..21473ce34c 100644
---
a/plugins/databases/kingbasees/src/test/java/org/apache/hop/databases/kingbasees/KingbaseESDatabaseMetaTest.java
+++
b/plugins/databases/kingbasees/src/test/java/org/apache/hop/databases/kingbasees/KingbaseESDatabaseMetaTest.java
@@ -42,6 +42,7 @@ class KingbaseESDatabaseMetaTest {
void setupBefore() {
nativeMeta = new KingbaseESDatabaseMeta();
nativeMeta.setAccessType(DatabaseMeta.TYPE_ACCESS_NATIVE);
+ nativeMeta.addDefaultOptions();
}
@Test
diff --git
a/plugins/databases/monetdb/src/main/java/org/apache/hop/databases/monetdb/MonetDBDatabaseMeta.java
b/plugins/databases/monetdb/src/main/java/org/apache/hop/databases/monetdb/MonetDBDatabaseMeta.java
index 8b96e24d1d..24a1e5e656 100644
---
a/plugins/databases/monetdb/src/main/java/org/apache/hop/databases/monetdb/MonetDBDatabaseMeta.java
+++
b/plugins/databases/monetdb/src/main/java/org/apache/hop/databases/monetdb/MonetDBDatabaseMeta.java
@@ -405,4 +405,9 @@ public class MonetDBDatabaseMeta extends BaseDatabaseMeta
implements IDatabase {
String realSequenceName = sequenceName.replace(getStartQuote(),
"").replace(getEndQuote(), "");
return String.format("SELECT next_value_for( 'sys', '%s' )",
realSequenceName);
}
+
+ @Override
+ public void addDefaultOptions() {
+ setSupportsBooleanDataType(true);
+ }
}
diff --git
a/plugins/databases/monetdb/src/test/java/org/apache/hop/databases/monetdb/MonetDBDatabaseMetaTest.java
b/plugins/databases/monetdb/src/test/java/org/apache/hop/databases/monetdb/MonetDBDatabaseMetaTest.java
index c3deda7e73..a29c5c3ed5 100644
---
a/plugins/databases/monetdb/src/test/java/org/apache/hop/databases/monetdb/MonetDBDatabaseMetaTest.java
+++
b/plugins/databases/monetdb/src/test/java/org/apache/hop/databases/monetdb/MonetDBDatabaseMetaTest.java
@@ -41,6 +41,7 @@ class MonetDBDatabaseMetaTest {
void setupBefore() {
nativeMeta = new MonetDBDatabaseMeta();
nativeMeta.setAccessType(DatabaseMeta.TYPE_ACCESS_NATIVE);
+ nativeMeta.addDefaultOptions();
}
@Test
diff --git
a/plugins/databases/mssql/src/main/java/org/apache/hop/databases/mssql/MsSqlServerDatabaseMeta.java
b/plugins/databases/mssql/src/main/java/org/apache/hop/databases/mssql/MsSqlServerDatabaseMeta.java
index d04193db7b..da7ab3ee03 100644
---
a/plugins/databases/mssql/src/main/java/org/apache/hop/databases/mssql/MsSqlServerDatabaseMeta.java
+++
b/plugins/databases/mssql/src/main/java/org/apache/hop/databases/mssql/MsSqlServerDatabaseMeta.java
@@ -911,4 +911,9 @@ public class MsSqlServerDatabaseMeta extends
BaseDatabaseMeta implements IDataba
public String getEndQuote() {
return "]";
}
+
+ @Override
+ public void addDefaultOptions() {
+ setSupportsBooleanDataType(true);
+ }
}
diff --git
a/plugins/databases/mssql/src/test/java/org/apache/hop/databases/mssql/MsSqlServerDatabaseMetaTest.java
b/plugins/databases/mssql/src/test/java/org/apache/hop/databases/mssql/MsSqlServerDatabaseMetaTest.java
index 02b9498fa1..e803c83688 100644
---
a/plugins/databases/mssql/src/test/java/org/apache/hop/databases/mssql/MsSqlServerDatabaseMetaTest.java
+++
b/plugins/databases/mssql/src/test/java/org/apache/hop/databases/mssql/MsSqlServerDatabaseMetaTest.java
@@ -76,6 +76,7 @@ class MsSqlServerDatabaseMetaTest {
void setupOnce() {
nativeMeta = new MsSqlServerDatabaseMeta();
nativeMeta.setAccessType(DatabaseMeta.TYPE_ACCESS_NATIVE);
+ nativeMeta.addDefaultOptions();
databaseMeta = new DatabaseMeta();
iDatabase = mock(IDatabase.class);
databaseMeta.setIDatabase(iDatabase);
@@ -539,7 +540,7 @@ class MsSqlServerDatabaseMetaTest {
@Test
void testGetFieldDefinition() {
assertEquals(
- "CHAR(1)",
+ "BIT",
nativeMeta.getFieldDefinition(new ValueMetaBoolean("BAR"), "", "",
false, false, false));
assertEquals(
diff --git
a/plugins/databases/mssqlnative/src/main/java/org/apache/hop/databases/mssqlnative/MsSqlServerNativeDatabaseMeta.java
b/plugins/databases/mssqlnative/src/main/java/org/apache/hop/databases/mssqlnative/MsSqlServerNativeDatabaseMeta.java
index 9214417b4c..545f514529 100644
---
a/plugins/databases/mssqlnative/src/main/java/org/apache/hop/databases/mssqlnative/MsSqlServerNativeDatabaseMeta.java
+++
b/plugins/databases/mssqlnative/src/main/java/org/apache/hop/databases/mssqlnative/MsSqlServerNativeDatabaseMeta.java
@@ -187,18 +187,10 @@ public class MsSqlServerNativeDatabaseMeta extends
MsSqlServerDatabaseMeta
return true;
}
- @Override
- public boolean isSupportsTimestampDataType() {
- return true;
- }
-
- @Override
- public boolean isSupportsBooleanDataType() {
- return true;
- }
-
@Override
public void addDefaultOptions() {
addExtraOption(getPluginId(), "encrypt", "false");
+ setSupportsTimestampDataType(true);
+ setSupportsBooleanDataType(true);
}
}
diff --git
a/plugins/databases/mysql/src/main/java/org/apache/hop/databases/mysql/MySqlDatabaseMeta.java
b/plugins/databases/mysql/src/main/java/org/apache/hop/databases/mysql/MySqlDatabaseMeta.java
index 103bb5f79a..7ae4ee75c0 100644
---
a/plugins/databases/mysql/src/main/java/org/apache/hop/databases/mysql/MySqlDatabaseMeta.java
+++
b/plugins/databases/mysql/src/main/java/org/apache/hop/databases/mysql/MySqlDatabaseMeta.java
@@ -227,14 +227,6 @@ public class MySqlDatabaseMeta extends BaseDatabaseMeta
implements IDatabase {
return false;
}
- /**
- * @return true if the database supports a boolean, bit, logical
- */
- @Override
- public boolean isSupportsBooleanDataType() {
- return true;
- }
-
/**
* Generates the SQL statement to add a column to the specified table
*
@@ -730,6 +722,8 @@ public class MySqlDatabaseMeta extends BaseDatabaseMeta
implements IDatabase {
addExtraOption(getPluginId(), "defaultFetchSize", "500");
addExtraOption(getPluginId(), "useCursorFetch", "true");
addExtraOption(getPluginId(), "zeroDateTimeBehaviorValue",
"CONVERT_TO_NULL");
+ setSupportsTimestampDataType(true);
+ setSupportsBooleanDataType(true);
}
@Override
@@ -796,9 +790,4 @@ public class MySqlDatabaseMeta extends BaseDatabaseMeta
implements IDatabase {
names.add("Mysql");
return names;
}
-
- @Override
- public boolean isSupportsTimestampDataType() {
- return true;
- }
}
diff --git
a/plugins/databases/mysql/src/test/java/org/apache/hop/databases/mysql/MySqlDatabaseMetaTest.java
b/plugins/databases/mysql/src/test/java/org/apache/hop/databases/mysql/MySqlDatabaseMetaTest.java
index 0b6f860d81..af683c7fc5 100644
---
a/plugins/databases/mysql/src/test/java/org/apache/hop/databases/mysql/MySqlDatabaseMetaTest.java
+++
b/plugins/databases/mysql/src/test/java/org/apache/hop/databases/mysql/MySqlDatabaseMetaTest.java
@@ -78,6 +78,7 @@ class MySqlDatabaseMetaTest {
void setupBefore() {
nativeMeta = new MySqlDatabaseMeta();
nativeMeta.setAccessType(DatabaseMeta.TYPE_ACCESS_NATIVE);
+ nativeMeta.addDefaultOptions();
}
@Test
diff --git
a/plugins/databases/oracle/src/main/java/org/apache/hop/databases/oracle/OracleDatabaseMeta.java
b/plugins/databases/oracle/src/main/java/org/apache/hop/databases/oracle/OracleDatabaseMeta.java
index f687866b1a..b52ba8d305 100644
---
a/plugins/databases/oracle/src/main/java/org/apache/hop/databases/oracle/OracleDatabaseMeta.java
+++
b/plugins/databases/oracle/src/main/java/org/apache/hop/databases/oracle/OracleDatabaseMeta.java
@@ -778,12 +778,8 @@ public class OracleDatabaseMeta extends BaseDatabaseMeta
implements IDatabase {
}
@Override
- public boolean isSupportsBooleanDataType() {
- return true;
- }
-
- @Override
- public boolean isSupportsTimestampDataType() {
- return true;
+ public void addDefaultOptions() {
+ setSupportsBooleanDataType(true);
+ setSupportsTimestampDataType(true);
}
}
diff --git
a/plugins/databases/oracle/src/test/java/org/apache/hop/databases/oracle/OracleDatabaseMetaTest.java
b/plugins/databases/oracle/src/test/java/org/apache/hop/databases/oracle/OracleDatabaseMetaTest.java
index 52b8b101bc..343aee19e9 100644
---
a/plugins/databases/oracle/src/test/java/org/apache/hop/databases/oracle/OracleDatabaseMetaTest.java
+++
b/plugins/databases/oracle/src/test/java/org/apache/hop/databases/oracle/OracleDatabaseMetaTest.java
@@ -76,6 +76,7 @@ class OracleDatabaseMetaTest {
void setupOnce() throws Exception {
nativeMeta = new OracleDatabaseMeta();
nativeMeta.setAccessType(DatabaseMeta.TYPE_ACCESS_NATIVE);
+ nativeMeta.addDefaultOptions();
HopClientEnvironment.init();
variables = Mockito.spy(new Variables());
}
diff --git
a/plugins/databases/postgresql/src/main/java/org/apache/hop/databases/postgresql/PostgreSqlDatabaseMeta.java
b/plugins/databases/postgresql/src/main/java/org/apache/hop/databases/postgresql/PostgreSqlDatabaseMeta.java
index 7164b04222..6915ff8087 100644
---
a/plugins/databases/postgresql/src/main/java/org/apache/hop/databases/postgresql/PostgreSqlDatabaseMeta.java
+++
b/plugins/databases/postgresql/src/main/java/org/apache/hop/databases/postgresql/PostgreSqlDatabaseMeta.java
@@ -1086,16 +1086,6 @@ public class PostgreSqlDatabaseMeta extends
BaseDatabaseMeta implements IDatabas
return true;
}
- @Override
- public boolean isSupportsBooleanDataType() {
- return true;
- }
-
- @Override
- public boolean isSupportsTimestampDataType() {
- return true;
- }
-
@Override
public boolean isSupportsGetBlob() {
return false;
@@ -1119,4 +1109,10 @@ public class PostgreSqlDatabaseMeta extends
BaseDatabaseMeta implements IDatabas
public int getMaxTextFieldLength() {
return GB_LIMIT;
}
+
+ @Override
+ public void addDefaultOptions() {
+ setSupportsBooleanDataType(true);
+ setSupportsTimestampDataType(true);
+ }
}
diff --git
a/plugins/databases/postgresql/src/test/java/org/apache/hop/databases/postgresql/PostgreSqlDatabaseMetaTest.java
b/plugins/databases/postgresql/src/test/java/org/apache/hop/databases/postgresql/PostgreSqlDatabaseMetaTest.java
index 38d27609a6..2cb4440ca3 100644
---
a/plugins/databases/postgresql/src/test/java/org/apache/hop/databases/postgresql/PostgreSqlDatabaseMetaTest.java
+++
b/plugins/databases/postgresql/src/test/java/org/apache/hop/databases/postgresql/PostgreSqlDatabaseMetaTest.java
@@ -42,6 +42,7 @@ public class PostgreSqlDatabaseMetaTest {
nativeMeta = new PostgreSqlDatabaseMeta();
nativeMeta.setAccessType(DatabaseMeta.TYPE_ACCESS_NATIVE);
+ nativeMeta.addDefaultOptions();
}
@Test
diff --git
a/plugins/databases/singlestore/src/main/java/org/apache/hop/databases/singlestore/SingleStoreDatabaseMeta.java
b/plugins/databases/singlestore/src/main/java/org/apache/hop/databases/singlestore/SingleStoreDatabaseMeta.java
index e868dc4e99..2cf3b63bd7 100644
---
a/plugins/databases/singlestore/src/main/java/org/apache/hop/databases/singlestore/SingleStoreDatabaseMeta.java
+++
b/plugins/databases/singlestore/src/main/java/org/apache/hop/databases/singlestore/SingleStoreDatabaseMeta.java
@@ -224,14 +224,6 @@ public class SingleStoreDatabaseMeta extends
BaseDatabaseMeta implements IDataba
return CONST_ALTER_TABLE + tableName + " DROP COLUMN " + v.getName();
}
- /**
- * @return true if the database supports a boolean, bit, logical
- */
- @Override
- public boolean isSupportsBooleanDataType() {
- return true;
- }
-
/**
* Generates the SQL statement to modify a column in the specified table
*
@@ -735,6 +727,8 @@ public class SingleStoreDatabaseMeta extends
BaseDatabaseMeta implements IDataba
@Override
public void addDefaultOptions() {
addExtraOption(getPluginId(), "defaultFetchSize", "500");
+ setSupportsTimestampDataType(true);
+ setSupportsBooleanDataType(true);
}
@Override
@@ -746,9 +740,4 @@ public class SingleStoreDatabaseMeta extends
BaseDatabaseMeta implements IDataba
public int getMaxTextFieldLength() {
return Integer.MAX_VALUE;
}
-
- @Override
- public boolean isSupportsTimestampDataType() {
- return true;
- }
}
diff --git
a/plugins/databases/singlestore/src/test/java/org/apache/hop/databases/singlestore/SingleStoreDatabaseMetaTest.java
b/plugins/databases/singlestore/src/test/java/org/apache/hop/databases/singlestore/SingleStoreDatabaseMetaTest.java
index 0cd1628f50..54df90b192 100644
---
a/plugins/databases/singlestore/src/test/java/org/apache/hop/databases/singlestore/SingleStoreDatabaseMetaTest.java
+++
b/plugins/databases/singlestore/src/test/java/org/apache/hop/databases/singlestore/SingleStoreDatabaseMetaTest.java
@@ -75,6 +75,7 @@ class SingleStoreDatabaseMetaTest {
void setupBefore() {
nativeMeta = new SingleStoreDatabaseMeta();
nativeMeta.setAccessType(DatabaseMeta.TYPE_ACCESS_NATIVE);
+ nativeMeta.addDefaultOptions();
}
@Test
diff --git
a/plugins/databases/snowflake/src/main/java/org/apache/hop/databases/snowflake/SnowflakeDatabaseMeta.java
b/plugins/databases/snowflake/src/main/java/org/apache/hop/databases/snowflake/SnowflakeDatabaseMeta.java
index 3d967dc796..7731932601 100644
---
a/plugins/databases/snowflake/src/main/java/org/apache/hop/databases/snowflake/SnowflakeDatabaseMeta.java
+++
b/plugins/databases/snowflake/src/main/java/org/apache/hop/databases/snowflake/SnowflakeDatabaseMeta.java
@@ -371,11 +371,6 @@ public class SnowflakeDatabaseMeta extends
BaseDatabaseMeta implements IDatabase
return false;
}
- @Override
- public boolean isSupportsBooleanDataType() {
- return true;
- }
-
@Override
public boolean IsSupportsErrorHandlingOnBatchUpdates() {
return true;
@@ -497,4 +492,9 @@ public class SnowflakeDatabaseMeta extends BaseDatabaseMeta
implements IDatabase
public boolean isRequiringTransactionsOnQueries() {
return false;
}
+
+ @Override
+ public void addDefaultOptions() {
+ setSupportsBooleanDataType(true);
+ }
}
diff --git
a/plugins/databases/snowflake/src/test/java/org/apache/hop/databases/snowflake/SnowflakeDatabaseMetaTest.java
b/plugins/databases/snowflake/src/test/java/org/apache/hop/databases/snowflake/SnowflakeDatabaseMetaTest.java
index 6ddf5d438b..dc9bf38470 100644
---
a/plugins/databases/snowflake/src/test/java/org/apache/hop/databases/snowflake/SnowflakeDatabaseMetaTest.java
+++
b/plugins/databases/snowflake/src/test/java/org/apache/hop/databases/snowflake/SnowflakeDatabaseMetaTest.java
@@ -42,6 +42,7 @@ class SnowflakeDatabaseMetaTest {
void setupOnce() throws Exception {
nativeMeta = new SnowflakeDatabaseMeta();
nativeMeta.setAccessType(DatabaseMeta.TYPE_ACCESS_NATIVE);
+ nativeMeta.addDefaultOptions();
HopClientEnvironment.init();
}
diff --git
a/plugins/databases/sybase/src/test/java/org/apache/hop/databases/sybase/SybaseDatabaseMetaTest.java
b/plugins/databases/sybase/src/test/java/org/apache/hop/databases/sybase/SybaseDatabaseMetaTest.java
index f8fb2efbd8..0f93eba428 100644
---
a/plugins/databases/sybase/src/test/java/org/apache/hop/databases/sybase/SybaseDatabaseMetaTest.java
+++
b/plugins/databases/sybase/src/test/java/org/apache/hop/databases/sybase/SybaseDatabaseMetaTest.java
@@ -40,6 +40,7 @@ class SybaseDatabaseMetaTest {
void setupBefore() {
nativeMeta = new SybaseDatabaseMeta();
nativeMeta.setAccessType(DatabaseMeta.TYPE_ACCESS_NATIVE);
+ nativeMeta.addDefaultOptions();
}
@Test
diff --git
a/plugins/databases/sybaseiq/src/test/java/org/apache/hop/databases/sybaseiq/SybaseIQDatabaseMetaTest.java
b/plugins/databases/sybaseiq/src/test/java/org/apache/hop/databases/sybaseiq/SybaseIQDatabaseMetaTest.java
index 07b1fc09de..43f1bb51b3 100644
---
a/plugins/databases/sybaseiq/src/test/java/org/apache/hop/databases/sybaseiq/SybaseIQDatabaseMetaTest.java
+++
b/plugins/databases/sybaseiq/src/test/java/org/apache/hop/databases/sybaseiq/SybaseIQDatabaseMetaTest.java
@@ -41,6 +41,7 @@ class SybaseIQDatabaseMetaTest {
void setupBefore() {
nativeMeta = new SybaseIQDatabaseMeta();
nativeMeta.setAccessType(DatabaseMeta.TYPE_ACCESS_NATIVE);
+ nativeMeta.addDefaultOptions();
}
@Test
diff --git
a/plugins/databases/vertica/src/main/java/org/apache/hop/databases/vertica/VerticaDatabaseMeta.java
b/plugins/databases/vertica/src/main/java/org/apache/hop/databases/vertica/VerticaDatabaseMeta.java
index dfa12dc79b..99fccd27e1 100644
---
a/plugins/databases/vertica/src/main/java/org/apache/hop/databases/vertica/VerticaDatabaseMeta.java
+++
b/plugins/databases/vertica/src/main/java/org/apache/hop/databases/vertica/VerticaDatabaseMeta.java
@@ -575,11 +575,6 @@ public class VerticaDatabaseMeta extends BaseDatabaseMeta
implements IDatabase {
return false;
}
- @Override
- public boolean isSupportsBooleanDataType() {
- return true;
- }
-
/**
* @return true if the database requires you to cast a parameter to varchar
before comparing to
* null. Only required for DB2 and Vertica
@@ -666,4 +661,9 @@ public class VerticaDatabaseMeta extends BaseDatabaseMeta
implements IDatabase {
public boolean isDisplaySizeTwiceThePrecision() {
return true;
}
+
+ @Override
+ public void addDefaultOptions() {
+ setSupportsBooleanDataType(true);
+ }
}
diff --git
a/plugins/databases/vertica/src/test/java/org/apache/hop/databases/vertica/VerticaDatabaseMetaTest.java
b/plugins/databases/vertica/src/test/java/org/apache/hop/databases/vertica/VerticaDatabaseMetaTest.java
index 8635017568..0702f6ba08 100644
---
a/plugins/databases/vertica/src/test/java/org/apache/hop/databases/vertica/VerticaDatabaseMetaTest.java
+++
b/plugins/databases/vertica/src/test/java/org/apache/hop/databases/vertica/VerticaDatabaseMetaTest.java
@@ -95,6 +95,7 @@ class VerticaDatabaseMetaTest {
void setupBefore() {
nativeMeta = new VerticaDatabaseMeta();
nativeMeta.setAccessType(DatabaseMeta.TYPE_ACCESS_NATIVE);
+ nativeMeta.addDefaultOptions();
}
@Test
diff --git
a/plugins/tech/databricks/src/main/java/org/apache/hop/database/databricks/DatabricksDatabaseMeta.java
b/plugins/tech/databricks/src/main/java/org/apache/hop/database/databricks/DatabricksDatabaseMeta.java
index dbdc393362..f2d47d27ee 100644
---
a/plugins/tech/databricks/src/main/java/org/apache/hop/database/databricks/DatabricksDatabaseMeta.java
+++
b/plugins/tech/databricks/src/main/java/org/apache/hop/database/databricks/DatabricksDatabaseMeta.java
@@ -142,16 +142,6 @@ public class DatabricksDatabaseMeta extends
BaseDatabaseMeta implements IDatabas
+ getFieldDefinition(v, tk, pk, useAutoIncrement, false, false);
}
- @Override
- public boolean isSupportsBooleanDataType() {
- return true;
- }
-
- @Override
- public boolean isSupportsTimestampDataType() {
- return true;
- }
-
@Override
public boolean isSupportsOptionsInURL() {
return true;
@@ -202,4 +192,10 @@ public class DatabricksDatabaseMeta extends
BaseDatabaseMeta implements IDatabas
public boolean isRequiresName() {
return false;
}
+
+ @Override
+ public void addDefaultOptions() {
+ setSupportsBooleanDataType(true);
+ setSupportsTimestampDataType(true);
+ }
}
