diff --git a/schemacrawler-dbtest/pom.xml b/schemacrawler-dbtest/pom.xml index 5efdf1a9a8..c05701055b 100644 --- a/schemacrawler-dbtest/pom.xml +++ b/schemacrawler-dbtest/pom.xml @@ -59,7 +59,7 @@ com.ing.data cassandra-jdbc-wrapper - 4.12.0 + 4.13.0 test diff --git a/schemacrawler-dbtest/src/test/java/schemacrawler/integration/test/CassandraTest.java b/schemacrawler-dbtest/src/test/java/schemacrawler/integration/test/WithoutPluginCassandraTest.java similarity index 98% rename from schemacrawler-dbtest/src/test/java/schemacrawler/integration/test/CassandraTest.java rename to schemacrawler-dbtest/src/test/java/schemacrawler/integration/test/WithoutPluginCassandraTest.java index d77eec1118..447412231e 100644 --- a/schemacrawler-dbtest/src/test/java/schemacrawler/integration/test/CassandraTest.java +++ b/schemacrawler-dbtest/src/test/java/schemacrawler/integration/test/WithoutPluginCassandraTest.java @@ -59,7 +59,7 @@ @HeavyDatabaseTest("cassandra") @Testcontainers -public class CassandraTest extends BaseAdditionalDatabaseTest { +public class WithoutPluginCassandraTest extends BaseAdditionalDatabaseTest { private final DockerImageName imageName = DockerImageName.parse("cassandra"); diff --git a/schemacrawler-dbtest/src/test/resources/testCassandraWithConnection.8.txt b/schemacrawler-dbtest/src/test/resources/testCassandraWithConnection.8.txt index 6ce722356d..94b380c909 100644 --- a/schemacrawler-dbtest/src/test/resources/testCassandraWithConnection.8.txt +++ b/schemacrawler-dbtest/src/test/resources/testCassandraWithConnection.8.txt @@ -3,10 +3,10 @@ System Information ======================================================================== -generated by SchemaCrawler 16.21.2 -generated on 2024-05-19 01:22:48 +generated by SchemaCrawler 16.22.1 +generated on 2024-08-04 20:25:50 database version Cassandra 5.0.0 -driver version Cassandra JDBC Driver 4.12.0 +driver version Cassandra JDBC Driver 4.13.0 @@ -278,7 +278,7 @@ deletes are detected for TYPE_SCROLL_INSENSITIVE result sets false deletes are detected for TYPE_SCROLL_SENSITIVE result sets false does max row size include blobs false driver major version 4 -driver minor version 12 +driver minor version 13 extra name characters generated key always returned false identifier quote string @@ -355,7 +355,7 @@ supports alter table with drop column true supports ANSI92 entry level SQL false supports ANSI92 full SQL false supports ANSI92 intermediate SQL false -supports batch updates false +supports batch updates true supports catalogs in data manipulation false supports catalogs in index definitions false supports catalogs in privilege definitions false @@ -429,9 +429,9 @@ uses local files false JDBC Driver Information -=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=- -connection url jdbc:cassandra://localhost:63329/books +connection url jdbc:cassandra://localhost:61522/books driver name Cassandra JDBC Driver -driver version 4.12.0 +driver version 4.13.0 driver class name com.ing.data.cassandra.jdbc.CassandraDriver is JDBC compliant false supported JDBC version 4.0 @@ -439,13 +439,108 @@ supported JDBC version 4.0 JDBC Driver Properties -=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=- +activeProfile [driver property] + The execution profile to use when the connection to Cassandra is created. + not required + value + +complianceMode [driver property] + The compliance mode used when the connection to the database is established. + not required; choices [Default, Liquibase] + value + +configFile [driver property] + The Cassandra client configuration file to use. + not required + value + +connectTimeout [driver property] + A custom connection timeout in milliseconds. By default, the connection timeout is 5 seconds. + not required + value + +consistencyLevel [driver property] + The consistency level per connection. The consistency level defaults to 'LOCAL_ONE' as defined in the configuration reference if not specified. + not required + value + +debug [driver property] + Whether the debug mode is enabled. + not required; choices [false, true] + value + +enableSsl [driver property] + Whether the secured traffic is enabled. + not required; choices [false, true] + value + +fetchSize [driver property] + The default fetch size for all the queries returning result sets. This value is the number of rows the server will return in each network frame. By default, this value is set to 100. + not required + value + +hostnameVerification [driver property] + Whether the validation of the server certificate's common name against the hostname of the server being connected to is enabled. By default, it's enabled if the secured traffic is enabled. + not required; choices [false, true] + value + +keepAlive [driver property] + Whether the TCP keep-alive is enabled. By default, it's disabled. + not required; choices [false, true] + value + +loadBalancing [driver property] + The custom load balancing policy to apply. The value must be the full package of the policy's class implementing 'LoadBalancingPolicy' interface. + not required + value + +localDatacenter [driver property] + The local datacenter to use when 'DefaultLoadBalancingPolicy' (used by default) is applied. + not required + value + password [driver property] - The 'password' property + The password used to connect to the database. + not required + value + +reconnection [driver property] + The custom reconnection policy to apply. By default, the driver will use 'ExponentialReconnectionPolicy'. If you want to use a custom policy, specify the full package of the policy's class. Make sure you always cast the policy's arguments appropriately. + not required + value + +requestTimeout [driver property] + A custom timeout for the queries in milliseconds. By default, the timeout for queries is 2 seconds. not required - value null + value + +retry [driver property] + The custom retry policy to apply. The value must be the full package of the policy's class implementing 'RetryPolicy' interface. By default, the driver will use 'DefaultRetryPolicy'. + not required + value + +secureConnectBundle [driver property] + The fully qualified path of the cloud secure connect bundle file used to connect to an AstraDB isntance. + not required + value + +sslEngineFactory [driver property] + The SSL engine factory to use. By default, 'DefaultSslEngineFactory' is used. The value must be the fully-qualified name of a class with a no-args constructor implementing 'SslEngineFactory' interface. + not required + value + +tcpNoDelay [driver property] + Whether the Nagle's algorithm is enabled. By default, it's enabled. + not required; choices [false, true] + value + +useKerberos [driver property] + Whether the Kerberos auth provider is enabled. By default, it's disabled. + not required; choices [false, true] + value user [driver property] - The 'user' property + The username used to connect to the database. not required - value null + value diff --git a/schemacrawler-dbtest/src/test/resources/testCassandraWithConnection.LTE.txt b/schemacrawler-dbtest/src/test/resources/testCassandraWithConnection.LTE.txt index 3280f3f3f9..8a36419eea 100644 --- a/schemacrawler-dbtest/src/test/resources/testCassandraWithConnection.LTE.txt +++ b/schemacrawler-dbtest/src/test/resources/testCassandraWithConnection.LTE.txt @@ -3,10 +3,10 @@ System Information ======================================================================== -generated by SchemaCrawler 16.21.2 -generated on 2024-05-19 01:30:56 +generated by SchemaCrawler 16.22.1 +generated on 2024-08-04 20:26:22 database version Cassandra 5.0.0 -driver version Cassandra JDBC Driver 4.12.0 +driver version Cassandra JDBC Driver 4.13.0 @@ -278,7 +278,7 @@ deletes are detected for TYPE_SCROLL_INSENSITIVE result sets false deletes are detected for TYPE_SCROLL_SENSITIVE result sets false does max row size include blobs false driver major version 4 -driver minor version 12 +driver minor version 13 extra name characters generated key always returned false identifier quote string @@ -355,7 +355,7 @@ supports alter table with drop column true supports ANSI92 entry level SQL false supports ANSI92 full SQL false supports ANSI92 intermediate SQL false -supports batch updates false +supports batch updates true supports catalogs in data manipulation false supports catalogs in index definitions false supports catalogs in privilege definitions false @@ -430,9 +430,9 @@ uses local files false JDBC Driver Information -=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=- -connection url jdbc:cassandra://localhost:64285/books +connection url jdbc:cassandra://localhost:61701/books driver name Cassandra JDBC Driver -driver version 4.12.0 +driver version 4.13.0 driver class name com.ing.data.cassandra.jdbc.CassandraDriver is JDBC compliant false supported JDBC version 4.0 @@ -440,13 +440,108 @@ supported JDBC version 4.0 JDBC Driver Properties -=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=- +activeProfile [driver property] + The execution profile to use when the connection to Cassandra is created. + not required + value + +complianceMode [driver property] + The compliance mode used when the connection to the database is established. + not required; choices [Default, Liquibase] + value + +configFile [driver property] + The Cassandra client configuration file to use. + not required + value + +connectTimeout [driver property] + A custom connection timeout in milliseconds. By default, the connection timeout is 5 seconds. + not required + value + +consistencyLevel [driver property] + The consistency level per connection. The consistency level defaults to 'LOCAL_ONE' as defined in the configuration reference if not specified. + not required + value + +debug [driver property] + Whether the debug mode is enabled. + not required; choices [false, true] + value + +enableSsl [driver property] + Whether the secured traffic is enabled. + not required; choices [false, true] + value + +fetchSize [driver property] + The default fetch size for all the queries returning result sets. This value is the number of rows the server will return in each network frame. By default, this value is set to 100. + not required + value + +hostnameVerification [driver property] + Whether the validation of the server certificate's common name against the hostname of the server being connected to is enabled. By default, it's enabled if the secured traffic is enabled. + not required; choices [false, true] + value + +keepAlive [driver property] + Whether the TCP keep-alive is enabled. By default, it's disabled. + not required; choices [false, true] + value + +loadBalancing [driver property] + The custom load balancing policy to apply. The value must be the full package of the policy's class implementing 'LoadBalancingPolicy' interface. + not required + value + +localDatacenter [driver property] + The local datacenter to use when 'DefaultLoadBalancingPolicy' (used by default) is applied. + not required + value + password [driver property] - The 'password' property + The password used to connect to the database. + not required + value + +reconnection [driver property] + The custom reconnection policy to apply. By default, the driver will use 'ExponentialReconnectionPolicy'. If you want to use a custom policy, specify the full package of the policy's class. Make sure you always cast the policy's arguments appropriately. + not required + value + +requestTimeout [driver property] + A custom timeout for the queries in milliseconds. By default, the timeout for queries is 2 seconds. not required - value null + value + +retry [driver property] + The custom retry policy to apply. The value must be the full package of the policy's class implementing 'RetryPolicy' interface. By default, the driver will use 'DefaultRetryPolicy'. + not required + value + +secureConnectBundle [driver property] + The fully qualified path of the cloud secure connect bundle file used to connect to an AstraDB isntance. + not required + value + +sslEngineFactory [driver property] + The SSL engine factory to use. By default, 'DefaultSslEngineFactory' is used. The value must be the fully-qualified name of a class with a no-args constructor implementing 'SslEngineFactory' interface. + not required + value + +tcpNoDelay [driver property] + Whether the Nagle's algorithm is enabled. By default, it's enabled. + not required; choices [false, true] + value + +useKerberos [driver property] + Whether the Kerberos auth provider is enabled. By default, it's disabled. + not required; choices [false, true] + value user [driver property] - The 'user' property + The username used to connect to the database. not required - value null + value diff --git a/schemacrawler-distrib/pom.xml b/schemacrawler-distrib/pom.xml index a7b6562a11..5118ddcbf0 100644 --- a/schemacrawler-distrib/pom.xml +++ b/schemacrawler-distrib/pom.xml @@ -190,7 +190,11 @@ location=".." /> - + + + @@ -208,6 +212,10 @@ location=".." /> + + + + diff --git a/schemacrawler-distrib/src/assembly/distribution.xml b/schemacrawler-distrib/src/assembly/distribution.xml index 9fb93c7c7c..7a4243dce3 100644 --- a/schemacrawler-distrib/src/assembly/distribution.xml +++ b/schemacrawler-distrib/src/assembly/distribution.xml @@ -23,8 +23,11 @@ description="Package SchemaCrawler distributable" /> + + + @@ -101,6 +104,8 @@ + + @@ -175,6 +180,8 @@ + + diff --git a/schemacrawler-distrib/src/assembly/main-distribution.xml b/schemacrawler-distrib/src/assembly/main-distribution.xml index 941d1da0ed..99d3a75d9f 100644 --- a/schemacrawler-distrib/src/assembly/main-distribution.xml +++ b/schemacrawler-distrib/src/assembly/main-distribution.xml @@ -30,6 +30,8 @@ + + @@ -111,6 +113,8 @@ + + diff --git a/schemacrawler-jdbc-drivers/pom.xml b/schemacrawler-jdbc-drivers/pom.xml index 2bdd335832..27c68c7873 100644 --- a/schemacrawler-jdbc-drivers/pom.xml +++ b/schemacrawler-jdbc-drivers/pom.xml @@ -100,17 +100,6 @@ trino-jdbc 453 - - com.ing.data - cassandra-jdbc-wrapper - 4.12.0 - - - com.github.jnr - jnr-posix - - - org.duckdb duckdb_jdbc