v16.18.1

Author: sualeh

pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>us.fatehi</groupId>
     <artifactId>schemacrawler-parent</artifactId>
-    <version>16.17.4</version>
+    <version>16.18.1</version>
   </parent>
   <artifactId>schemacrawler-database-plugins-parent</artifactId>
   <packaging>pom</packaging>

schemacrawler-hana/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>us.fatehi</groupId>
     <artifactId>schemacrawler-parent</artifactId>
-    <version>16.17.4</version>
+    <version>16.18.1</version>
   </parent>
   <artifactId>schemacrawler-hana</artifactId>
   <packaging>jar</packaging>

schemacrawler-hana/src/main/java/schemacrawler/tools/hana/HanaDatabaseConnector.java

@@ -32,9 +32,9 @@
 import java.util.logging.Logger;
 
 import schemacrawler.schemacrawler.DatabaseServerType;
-import schemacrawler.tools.databaseconnector.DatabaseConnectionUrlBuilder;
 import schemacrawler.tools.databaseconnector.DatabaseConnector;
 import schemacrawler.tools.executable.commandline.PluginCommand;
+import us.fatehi.utility.datasource.DatabaseConnectionSourceBuilder;
 
 public final class HanaDatabaseConnector extends DatabaseConnector {
 
@@ -49,7 +49,7 @@ public HanaDatabaseConnector() {
         (schemaRetrievalOptionsBuilder, connection) -> {},
         limitOptionsBuilder -> {},
         () ->
-            DatabaseConnectionUrlBuilder.builder(
+            DatabaseConnectionSourceBuilder.builder(
                     "jdbc:sap://${host}:${port}/?databaseName=${database}")
                 .withDefaultPort(30015));
     LOGGER.log(Level.INFO, "Loaded commandline for SAP HANA");

schemacrawler-sapiq/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>us.fatehi</groupId>
     <artifactId>schemacrawler-parent</artifactId>
-    <version>16.17.4</version>
+    <version>16.18.1</version>
   </parent>
   <artifactId>schemacrawler-sapiq</artifactId>
   <packaging>jar</packaging>

schemacrawler-sapiq/src/main/java/schemacrawler/server/sapiq/SAPIQDatabaseConnector.java

@@ -29,9 +29,9 @@
 package schemacrawler.server.sapiq;
 
 import schemacrawler.schemacrawler.DatabaseServerType;
-import schemacrawler.tools.databaseconnector.DatabaseConnectionUrlBuilder;
 import schemacrawler.tools.databaseconnector.DatabaseConnector;
 import schemacrawler.tools.executable.commandline.PluginCommand;
+import us.fatehi.utility.datasource.DatabaseConnectionSourceBuilder;
 
 public final class SAPIQDatabaseConnector extends DatabaseConnector {
 
@@ -44,7 +44,7 @@ public SAPIQDatabaseConnector() {
         (schemaRetrievalOptionsBuilder, connection) -> {},
         limitOptionsBuilder -> {},
         () ->
-            DatabaseConnectionUrlBuilder.builder("jdbc:sybase:Tds:${host}:${port}")
+            DatabaseConnectionSourceBuilder.builder("jdbc:sybase:Tds:${host}:${port}")
                 .withDefaultPort(50000));
   }
 

schemacrawler-sapiq/src/main/java/schemacrawler/server/sapiq/SAPIQOdbcDatabaseConnector.java

@@ -29,9 +29,9 @@
 package schemacrawler.server.sapiq;
 
 import schemacrawler.schemacrawler.DatabaseServerType;
-import schemacrawler.tools.databaseconnector.DatabaseConnectionUrlBuilder;
 import schemacrawler.tools.databaseconnector.DatabaseConnector;
 import schemacrawler.tools.executable.commandline.PluginCommand;
+import us.fatehi.utility.datasource.DatabaseConnectionSourceBuilder;
 
 public final class SAPIQOdbcDatabaseConnector extends DatabaseConnector {
 
@@ -45,7 +45,7 @@ public SAPIQOdbcDatabaseConnector() {
             schemaRetrievalOptionsBuilder.withDoesNotSupportCatalogs(),
         limitOptionsBuilder -> {},
         () ->
-            DatabaseConnectionUrlBuilder.builder("jdbc:sybase:Tds:${host}:${port}")
+            DatabaseConnectionSourceBuilder.builder("jdbc:sybase:Tds:${host}:${port}")
                 .withDefaultPort(50000));
   }
 

schemacrawler-teiid/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>us.fatehi</groupId>
     <artifactId>schemacrawler-parent</artifactId>
-    <version>16.17.4</version>
+    <version>16.18.1</version>
   </parent>
   <artifactId>schemacrawler-teiid</artifactId>
   <packaging>jar</packaging>

schemacrawler-teiid/src/main/java/schemacrawler/tools/teiid/TeiidDatabaseConnector.java

@@ -32,9 +32,9 @@
 import java.util.logging.Logger;
 
 import schemacrawler.schemacrawler.DatabaseServerType;
-import schemacrawler.tools.databaseconnector.DatabaseConnectionUrlBuilder;
 import schemacrawler.tools.databaseconnector.DatabaseConnector;
 import schemacrawler.tools.executable.commandline.PluginCommand;
+import us.fatehi.utility.datasource.DatabaseConnectionSourceBuilder;
 
 public final class TeiidDatabaseConnector extends DatabaseConnector {
 
@@ -49,7 +49,7 @@ public TeiidDatabaseConnector() {
             schemaRetrievalOptionsBuilder.withSupportsCatalogs().withSupportsSchemas(),
         limitOptionsBuilder -> {},
         () ->
-            DatabaseConnectionUrlBuilder.builder("jdbc:teiid://${host}:${database}")
+            DatabaseConnectionSourceBuilder.builder("jdbc:teiid://${host}:${database}")
                 .withDefaultUrlx("ApplicationName", "SchemaCrawler"));
     LOGGER.log(Level.INFO, "Loaded commandline for Teiid");
   }

schemacrawler-teiid/src/test/java/schemacrawler/integration/test/TeiidTest.java

@@ -57,11 +57,13 @@
 import schemacrawler.tools.command.text.schema.options.SchemaTextOptions;
 import schemacrawler.tools.command.text.schema.options.SchemaTextOptionsBuilder;
 import schemacrawler.tools.executable.SchemaCrawlerExecutable;
+import us.fatehi.utility.datasource.DatabaseConnectionSource;
+import us.fatehi.utility.datasource.DatabaseConnectionSourceUtility;
 
 @TestInstance(Lifecycle.PER_CLASS)
 public class TeiidTest extends BaseAdditionalDatabaseTest {
 
-  private Connection connection;
+  private DatabaseConnectionSource dataSource;
 
   @BeforeAll
   public void createDatabase() throws Exception {
@@ -104,7 +106,8 @@ public void createDatabase() throws Exception {
 
     server.deployVDB("TEEID_VDB", hsqldbModel, virtualModel);
 
-    connection = server.getDriver().connect("jdbc:teiid:TEEID_VDB", null);
+    final Connection connection = server.getDriver().connect("jdbc:teiid:TEEID_VDB", null);
+    dataSource = DatabaseConnectionSourceUtility.newTestDatabaseConnectionSource(connection);
   }
 
   @Test
@@ -119,7 +122,7 @@ public void testTeiidDump() throws Exception {
 
     final String expectedResource = "testTeiidDump.txt";
     assertThat(
-        outputOf(executableExecution(connection, executable)),
+        outputOf(executableExecution(dataSource, executable)),
         hasSameContentAs(classpathResource(expectedResource)));
   }
 
@@ -141,7 +144,7 @@ public void testTeiidWithConnection() throws Exception {
 
     final String expectedResource = String.format("testTeiidWithConnection.%s.txt", javaVersion());
     assertThat(
-        outputOf(executableExecution(connection, executable)),
+        outputOf(executableExecution(dataSource, executable)),
         hasSameContentAs(classpathResource(expectedResource)));
   }
 

schemacrawler-timesten/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>us.fatehi</groupId>
     <artifactId>schemacrawler-parent</artifactId>
-    <version>16.17.4</version>
+    <version>16.18.1</version>
   </parent>
   <artifactId>schemacrawler-timesten</artifactId>
   <packaging>jar</packaging>