Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes issue #1560 by not distributing the Cassandra drivers #1645

Merged
merged 6 commits into from
Aug 4, 2024
Merged

Fixes issue #1560 by not distributing the Cassandra drivers #1645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1f03080
Add debugging echo
sualeh Aug 4, 2024
f7f4611
Update Cassandra driver
sualeh Aug 4, 2024
7fde5f0
Remove Cassandra driver distribution
sualeh Aug 4, 2024
9872c0a
Rename test
sualeh Aug 4, 2024
e9ac8db
Merge branch 'main' into issue1560
sualeh Aug 4, 2024
8608325
Fix Cassandra tests
sualeh Aug 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion schemacrawler-dbtest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<dependency>
<groupId>com.ing.data</groupId>
<artifactId>cassandra-jdbc-wrapper</artifactId>
<version>4.12.0</version>
<version>4.13.0</version>
<scope>test</scope>
</dependency>
<!-- -->
Expand Down
2 changes: 1 addition & 1 deletion ...awler/integration/test/CassandraTest.java → ...tion/test/WithoutPluginCassandraTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

@HeavyDatabaseTest("cassandra")
@Testcontainers
public class CassandraTest extends BaseAdditionalDatabaseTest {
public class WithoutPluginCassandraTest extends BaseAdditionalDatabaseTest {

private final DockerImageName imageName = DockerImageName.parse("cassandra");

Expand Down
117 changes: 106 additions & 11 deletions schemacrawler-dbtest/src/test/resources/testCassandraWithConnection.8.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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



Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -429,23 +429,118 @@ 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


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

117 changes: 106 additions & 11 deletions schemacrawler-dbtest/src/test/resources/testCassandraWithConnection.LTE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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



Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -430,23 +430,118 @@ 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


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

10 changes: 9 additions & 1 deletion schemacrawler-distrib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,11 @@
location=".." />
<property name="SchemaCrawler.version"
value="${project.version}" />
<ant antfile="src\assembly\distribution.xml"

<echo message="$${SchemaCrawler.home}: ${SchemaCrawler.home}" />
<echo message="$${SchemaCrawler.version}: ${project.version}" />

<ant antfile="./src/assembly/distribution.xml"
target="make" />
</target>
</configuration>
Expand All @@ -208,6 +212,10 @@
location=".." />
<property name="SchemaCrawler.version"
value="${project.version}" />

<echo message="$${SchemaCrawler.home}: ${SchemaCrawler.home}" />
<echo message="$${SchemaCrawler.version}: ${project.version}" />

<ant antfile="src\assembly\main-distribution.xml"
target="make" />
</target>
Expand Down
7 changes: 7 additions & 0 deletions schemacrawler-distrib/src/assembly/distribution.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@
description="Package SchemaCrawler distributable" />



<target name="make-base-distribution">

<echo message="Running ant target: make-base-distribution" />

<property
name="distribution.assembly"
location="${SchemaCrawler.home}/schemacrawler-distrib/src/assembly" />
Expand Down Expand Up @@ -101,6 +104,8 @@

<target name="make-expanded-distribution">

<echo message="Running ant target: make-expanded-distribution" />

<property
name="distribution.downloader"
location="${SchemaCrawler.home}/schemacrawler-distrib/src/examples/resources/_downloader" />
Expand Down Expand Up @@ -175,6 +180,8 @@

<target name="make-binary-distribution-zip">

<echo message="Running ant target: make-binary-distribution-zip" />

<property name="binary-distribution.staging.dir" location="${distribution.target}/_expanded-distribution" />
<property name="binary-distribution.stem"
value="schemacrawler-${SchemaCrawler.version}-bin" />
Expand Down
Loading
Loading