From 38ce8f22f4fcc607183db6b3d842258164f546bd Mon Sep 17 00:00:00 2001 From: Sualeh Fatehi Date: Sat, 24 Aug 2024 11:04:56 -0400 Subject: [PATCH 1/4] Update PostgreSQL driver --- .../testCockroachDBWithConnection.8.txt | 40 ++++++++++++++----- .../testCockroachDBWithConnection.LTE.txt | 40 ++++++++++++++----- .../testPostgreSQLWithConnection.8.txt | 40 ++++++++++++++----- .../testPostgreSQLWithConnection.LTE.txt | 40 ++++++++++++++----- schemacrawler-jdbc-drivers/pom.xml | 2 +- schemacrawler-postgresql/pom.xml | 2 +- .../testPostgreSQL15WithConnection.8.txt | 40 ++++++++++++++----- .../testPostgreSQL15WithConnection.LTE.txt | 40 ++++++++++++++----- .../testPostgreSQLWithConnection.8.txt | 40 ++++++++++++++----- .../testPostgreSQLWithConnection.LTE.txt | 40 ++++++++++++++----- 10 files changed, 250 insertions(+), 74 deletions(-) diff --git a/schemacrawler-dbtest/src/test/resources/testCockroachDBWithConnection.8.txt b/schemacrawler-dbtest/src/test/resources/testCockroachDBWithConnection.8.txt index 76a7d503aa..94a2518f50 100644 --- a/schemacrawler-dbtest/src/test/resources/testCockroachDBWithConnection.8.txt +++ b/schemacrawler-dbtest/src/test/resources/testCockroachDBWithConnection.8.txt @@ -3,10 +3,10 @@ System Information ======================================================================== -generated by SchemaCrawler 16.20.6 -generated on 2023-11-26 15:52:35 +generated by SchemaCrawler 16.22.2 +generated on 2024-08-24 14:30:36 database version PostgreSQL 9.5.0 -driver version PostgreSQL JDBC Driver 42.7.0 +driver version PostgreSQL JDBC Driver 42.7.4 @@ -844,9 +844,9 @@ uses local files false JDBC Driver Information -=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=- -connection url jdbc:postgresql://localhost:63026/postgres +connection url jdbc:postgresql://localhost:57973/postgres driver name PostgreSQL JDBC Driver -driver version 42.7.0 +driver version 42.7.4 driver class name org.postgresql.Driver is JDBC compliant false supported JDBC version 4.2 @@ -882,7 +882,7 @@ ApplicationName [driver property] assumeMinServerVersion [driver property] Assume the server is at least that version not required - value null + value 9.1 authenticationPluginClassName [driver property] Name of class which implements AuthenticationPlugin @@ -895,7 +895,7 @@ autosave [driver property] value never binaryTransfer [driver property] - Use binary format for sending and receiving data if possible + Enable binary transfer for supported built-in types if possible. Setting this to false disables any binary transfer unless it's individually activated for each type with `binaryTransferEnable`. not required value true @@ -905,7 +905,7 @@ binaryTransferDisable [driver property] value binaryTransferEnable [driver property] - Comma separated list of types to enable binary transfer. Either OID numbers or names + Comma separated list of types to enable binary transfer. Either OID numbers or names. not required value @@ -914,6 +914,11 @@ cancelSignalTimeout [driver property] not required value 10 +channelBinding [driver property] + This option controls the client's use of channel binding. + not required; choices [disable, prefer, require] + value prefer + cleanupSavepoints [driver property] Determine whether SAVEPOINTS used in AUTOSAVE will be released per query or not not required; choices [false, true] @@ -1039,6 +1044,11 @@ maxResultBuffer [driver property] not required value null +maxSendBufferSize [driver property] + Maximum amount of bytes buffered before sending to the backend + not required + value 8192 + options [driver property] Specify 'options' connection initialization parameter. not required @@ -1062,7 +1072,7 @@ PGHOST [driver property] PGPORT [driver property] Port of the PostgreSQL server (may be specified directly in the JDBC URL) not required - value 63026 + value 57973 preferQueryMode [driver property] Specifies which mode is used to execute queries to database: simple means ('Q' execute, no parse, no bind, text mode only), extended means always use bind/execute messages, extendedForPrepared means extended for prepared statements only, extendedCacheEverything means use extended protocol and try cache every statement (including Statement.execute(String sql)) in a query cache. @@ -1179,6 +1189,18 @@ sslmode [driver property] not required; choices [allow, disable, prefer, require, verify-ca, verify-full] value null +sslNegotiation [driver property] + This option controls whether the driver will perform its protocol +negotiation to request encryption from the server or will just +directly make a standard SSL connection. Traditional PostgreSQL +protocol negotiation is the default and the most flexible with +different server configurations. If the server is known to support +direct SSL connections then the latter requires one +fewer round trip reducing connection latency and also allows the use +of protocol agnostic SSL network tools. + not required; choices [direct, postgres] + value postgres + sslpassword [driver property] The password for the client's ssl key (ignored if sslpasswordcallback is set) not required diff --git a/schemacrawler-dbtest/src/test/resources/testCockroachDBWithConnection.LTE.txt b/schemacrawler-dbtest/src/test/resources/testCockroachDBWithConnection.LTE.txt index e82542b4a4..195ae3927f 100644 --- a/schemacrawler-dbtest/src/test/resources/testCockroachDBWithConnection.LTE.txt +++ b/schemacrawler-dbtest/src/test/resources/testCockroachDBWithConnection.LTE.txt @@ -3,10 +3,10 @@ System Information ======================================================================== -generated by SchemaCrawler 16.20.6 -generated on 2023-11-26 15:53:43 +generated by SchemaCrawler 16.22.2 +generated on 2024-08-24 14:57:05 database version PostgreSQL 9.5.0 -driver version PostgreSQL JDBC Driver 42.7.0 +driver version PostgreSQL JDBC Driver 42.7.4 @@ -845,9 +845,9 @@ uses local files false JDBC Driver Information -=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=- -connection url jdbc:postgresql://localhost:63432/postgres +connection url jdbc:postgresql://localhost:59254/postgres driver name PostgreSQL JDBC Driver -driver version 42.7.0 +driver version 42.7.4 driver class name org.postgresql.Driver is JDBC compliant false supported JDBC version 4.2 @@ -883,7 +883,7 @@ ApplicationName [driver property] assumeMinServerVersion [driver property] Assume the server is at least that version not required - value null + value 9.1 authenticationPluginClassName [driver property] Name of class which implements AuthenticationPlugin @@ -896,7 +896,7 @@ autosave [driver property] value never binaryTransfer [driver property] - Use binary format for sending and receiving data if possible + Enable binary transfer for supported built-in types if possible. Setting this to false disables any binary transfer unless it's individually activated for each type with `binaryTransferEnable`. not required value true @@ -906,7 +906,7 @@ binaryTransferDisable [driver property] value binaryTransferEnable [driver property] - Comma separated list of types to enable binary transfer. Either OID numbers or names + Comma separated list of types to enable binary transfer. Either OID numbers or names. not required value @@ -915,6 +915,11 @@ cancelSignalTimeout [driver property] not required value 10 +channelBinding [driver property] + This option controls the client's use of channel binding. + not required; choices [disable, prefer, require] + value prefer + cleanupSavepoints [driver property] Determine whether SAVEPOINTS used in AUTOSAVE will be released per query or not not required; choices [false, true] @@ -1040,6 +1045,11 @@ maxResultBuffer [driver property] not required value null +maxSendBufferSize [driver property] + Maximum amount of bytes buffered before sending to the backend + not required + value 8192 + options [driver property] Specify 'options' connection initialization parameter. not required @@ -1063,7 +1073,7 @@ PGHOST [driver property] PGPORT [driver property] Port of the PostgreSQL server (may be specified directly in the JDBC URL) not required - value 63432 + value 59254 preferQueryMode [driver property] Specifies which mode is used to execute queries to database: simple means ('Q' execute, no parse, no bind, text mode only), extended means always use bind/execute messages, extendedForPrepared means extended for prepared statements only, extendedCacheEverything means use extended protocol and try cache every statement (including Statement.execute(String sql)) in a query cache. @@ -1180,6 +1190,18 @@ sslmode [driver property] not required; choices [allow, disable, prefer, require, verify-ca, verify-full] value null +sslNegotiation [driver property] + This option controls whether the driver will perform its protocol +negotiation to request encryption from the server or will just +directly make a standard SSL connection. Traditional PostgreSQL +protocol negotiation is the default and the most flexible with +different server configurations. If the server is known to support +direct SSL connections then the latter requires one +fewer round trip reducing connection latency and also allows the use +of protocol agnostic SSL network tools. + not required; choices [direct, postgres] + value postgres + sslpassword [driver property] The password for the client's ssl key (ignored if sslpasswordcallback is set) not required diff --git a/schemacrawler-dbtest/src/test/resources/testPostgreSQLWithConnection.8.txt b/schemacrawler-dbtest/src/test/resources/testPostgreSQLWithConnection.8.txt index a6b2a834f9..be18868fcd 100644 --- a/schemacrawler-dbtest/src/test/resources/testPostgreSQLWithConnection.8.txt +++ b/schemacrawler-dbtest/src/test/resources/testPostgreSQLWithConnection.8.txt @@ -3,10 +3,10 @@ System Information ======================================================================== -generated by SchemaCrawler 16.20.8 -generated on 2024-01-09 22:11:55 +generated by SchemaCrawler 16.22.2 +generated on 2024-08-24 14:30:58 database version PostgreSQL 15.4 (Debian 15.4-2.pgdg120+1) -driver version PostgreSQL JDBC Driver 42.7.1 +driver version PostgreSQL JDBC Driver 42.7.4 @@ -3486,9 +3486,9 @@ uses local files false JDBC Driver Information -=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=- -connection url jdbc:postgresql://localhost:53899/test?loggerLevel=OFF +connection url jdbc:postgresql://localhost:58083/test?loggerLevel=OFF driver name PostgreSQL JDBC Driver -driver version 42.7.1 +driver version 42.7.4 driver class name org.postgresql.Driver is JDBC compliant false supported JDBC version 4.2 @@ -3524,7 +3524,7 @@ ApplicationName [driver property] assumeMinServerVersion [driver property] Assume the server is at least that version not required - value null + value 9.1 authenticationPluginClassName [driver property] Name of class which implements AuthenticationPlugin @@ -3537,7 +3537,7 @@ autosave [driver property] value never binaryTransfer [driver property] - Use binary format for sending and receiving data if possible + Enable binary transfer for supported built-in types if possible. Setting this to false disables any binary transfer unless it's individually activated for each type with `binaryTransferEnable`. not required value true @@ -3547,7 +3547,7 @@ binaryTransferDisable [driver property] value binaryTransferEnable [driver property] - Comma separated list of types to enable binary transfer. Either OID numbers or names + Comma separated list of types to enable binary transfer. Either OID numbers or names. not required value @@ -3556,6 +3556,11 @@ cancelSignalTimeout [driver property] not required value 10 +channelBinding [driver property] + This option controls the client's use of channel binding. + not required; choices [disable, prefer, require] + value prefer + cleanupSavepoints [driver property] Determine whether SAVEPOINTS used in AUTOSAVE will be released per query or not not required; choices [false, true] @@ -3681,6 +3686,11 @@ maxResultBuffer [driver property] not required value null +maxSendBufferSize [driver property] + Maximum amount of bytes buffered before sending to the backend + not required + value 8192 + options [driver property] Specify 'options' connection initialization parameter. not required @@ -3704,7 +3714,7 @@ PGHOST [driver property] PGPORT [driver property] Port of the PostgreSQL server (may be specified directly in the JDBC URL) not required - value 53899 + value 58083 preferQueryMode [driver property] Specifies which mode is used to execute queries to database: simple means ('Q' execute, no parse, no bind, text mode only), extended means always use bind/execute messages, extendedForPrepared means extended for prepared statements only, extendedCacheEverything means use extended protocol and try cache every statement (including Statement.execute(String sql)) in a query cache. @@ -3821,6 +3831,18 @@ sslmode [driver property] not required; choices [allow, disable, prefer, require, verify-ca, verify-full] value null +sslNegotiation [driver property] + This option controls whether the driver will perform its protocol +negotiation to request encryption from the server or will just +directly make a standard SSL connection. Traditional PostgreSQL +protocol negotiation is the default and the most flexible with +different server configurations. If the server is known to support +direct SSL connections then the latter requires one +fewer round trip reducing connection latency and also allows the use +of protocol agnostic SSL network tools. + not required; choices [direct, postgres] + value postgres + sslpassword [driver property] The password for the client's ssl key (ignored if sslpasswordcallback is set) not required diff --git a/schemacrawler-dbtest/src/test/resources/testPostgreSQLWithConnection.LTE.txt b/schemacrawler-dbtest/src/test/resources/testPostgreSQLWithConnection.LTE.txt index 63b31d2ce4..6d3f7d99d6 100644 --- a/schemacrawler-dbtest/src/test/resources/testPostgreSQLWithConnection.LTE.txt +++ b/schemacrawler-dbtest/src/test/resources/testPostgreSQLWithConnection.LTE.txt @@ -3,10 +3,10 @@ System Information ======================================================================== -generated by SchemaCrawler 16.20.8 -generated on 2024-01-09 22:16:19 +generated by SchemaCrawler 16.22.2 +generated on 2024-08-24 14:57:26 database version PostgreSQL 15.4 (Debian 15.4-2.pgdg120+1) -driver version PostgreSQL JDBC Driver 42.7.1 +driver version PostgreSQL JDBC Driver 42.7.4 @@ -3487,9 +3487,9 @@ uses local files false JDBC Driver Information -=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=- -connection url jdbc:postgresql://localhost:54439/test?loggerLevel=OFF +connection url jdbc:postgresql://localhost:59358/test?loggerLevel=OFF driver name PostgreSQL JDBC Driver -driver version 42.7.1 +driver version 42.7.4 driver class name org.postgresql.Driver is JDBC compliant false supported JDBC version 4.2 @@ -3525,7 +3525,7 @@ ApplicationName [driver property] assumeMinServerVersion [driver property] Assume the server is at least that version not required - value null + value 9.1 authenticationPluginClassName [driver property] Name of class which implements AuthenticationPlugin @@ -3538,7 +3538,7 @@ autosave [driver property] value never binaryTransfer [driver property] - Use binary format for sending and receiving data if possible + Enable binary transfer for supported built-in types if possible. Setting this to false disables any binary transfer unless it's individually activated for each type with `binaryTransferEnable`. not required value true @@ -3548,7 +3548,7 @@ binaryTransferDisable [driver property] value binaryTransferEnable [driver property] - Comma separated list of types to enable binary transfer. Either OID numbers or names + Comma separated list of types to enable binary transfer. Either OID numbers or names. not required value @@ -3557,6 +3557,11 @@ cancelSignalTimeout [driver property] not required value 10 +channelBinding [driver property] + This option controls the client's use of channel binding. + not required; choices [disable, prefer, require] + value prefer + cleanupSavepoints [driver property] Determine whether SAVEPOINTS used in AUTOSAVE will be released per query or not not required; choices [false, true] @@ -3682,6 +3687,11 @@ maxResultBuffer [driver property] not required value null +maxSendBufferSize [driver property] + Maximum amount of bytes buffered before sending to the backend + not required + value 8192 + options [driver property] Specify 'options' connection initialization parameter. not required @@ -3705,7 +3715,7 @@ PGHOST [driver property] PGPORT [driver property] Port of the PostgreSQL server (may be specified directly in the JDBC URL) not required - value 54439 + value 59358 preferQueryMode [driver property] Specifies which mode is used to execute queries to database: simple means ('Q' execute, no parse, no bind, text mode only), extended means always use bind/execute messages, extendedForPrepared means extended for prepared statements only, extendedCacheEverything means use extended protocol and try cache every statement (including Statement.execute(String sql)) in a query cache. @@ -3822,6 +3832,18 @@ sslmode [driver property] not required; choices [allow, disable, prefer, require, verify-ca, verify-full] value null +sslNegotiation [driver property] + This option controls whether the driver will perform its protocol +negotiation to request encryption from the server or will just +directly make a standard SSL connection. Traditional PostgreSQL +protocol negotiation is the default and the most flexible with +different server configurations. If the server is known to support +direct SSL connections then the latter requires one +fewer round trip reducing connection latency and also allows the use +of protocol agnostic SSL network tools. + not required; choices [direct, postgres] + value postgres + sslpassword [driver property] The password for the client's ssl key (ignored if sslpasswordcallback is set) not required diff --git a/schemacrawler-jdbc-drivers/pom.xml b/schemacrawler-jdbc-drivers/pom.xml index f68ba6a515..ae678e5700 100644 --- a/schemacrawler-jdbc-drivers/pom.xml +++ b/schemacrawler-jdbc-drivers/pom.xml @@ -19,7 +19,7 @@ org.postgresql postgresql - 42.7.3 + 42.7.4 com.mysql diff --git a/schemacrawler-postgresql/pom.xml b/schemacrawler-postgresql/pom.xml index 5b7bf35a63..d9ab045c12 100644 --- a/schemacrawler-postgresql/pom.xml +++ b/schemacrawler-postgresql/pom.xml @@ -65,7 +65,7 @@ org.postgresql postgresql - 42.7.3 + 42.7.4 diff --git a/schemacrawler-postgresql/src/test/resources/testPostgreSQL15WithConnection.8.txt b/schemacrawler-postgresql/src/test/resources/testPostgreSQL15WithConnection.8.txt index 8deea93c4e..ddb186b096 100644 --- a/schemacrawler-postgresql/src/test/resources/testPostgreSQL15WithConnection.8.txt +++ b/schemacrawler-postgresql/src/test/resources/testPostgreSQL15WithConnection.8.txt @@ -3,10 +3,10 @@ System Information ======================================================================== -generated by SchemaCrawler 16.20.8 -generated on 2024-01-12 23:08:24 +generated by SchemaCrawler 16.22.2 +generated on 2024-08-24 14:26:40 database version PostgreSQL 15.4 -driver version PostgreSQL JDBC Driver 42.7.1 +driver version PostgreSQL JDBC Driver 42.7.4 @@ -3651,9 +3651,9 @@ uses local files false JDBC Driver Information -=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=- -connection url jdbc:postgresql://localhost:61923/test?loggerLevel=OFF +connection url jdbc:postgresql://localhost:57774/test?loggerLevel=OFF driver name PostgreSQL JDBC Driver -driver version 42.7.1 +driver version 42.7.4 driver class name org.postgresql.Driver is JDBC compliant false supported JDBC version 4.2 @@ -3689,7 +3689,7 @@ ApplicationName [driver property] assumeMinServerVersion [driver property] Assume the server is at least that version not required - value null + value 9.1 authenticationPluginClassName [driver property] Name of class which implements AuthenticationPlugin @@ -3702,7 +3702,7 @@ autosave [driver property] value never binaryTransfer [driver property] - Use binary format for sending and receiving data if possible + Enable binary transfer for supported built-in types if possible. Setting this to false disables any binary transfer unless it's individually activated for each type with `binaryTransferEnable`. not required value true @@ -3712,7 +3712,7 @@ binaryTransferDisable [driver property] value binaryTransferEnable [driver property] - Comma separated list of types to enable binary transfer. Either OID numbers or names + Comma separated list of types to enable binary transfer. Either OID numbers or names. not required value @@ -3721,6 +3721,11 @@ cancelSignalTimeout [driver property] not required value 10 +channelBinding [driver property] + This option controls the client's use of channel binding. + not required; choices [disable, prefer, require] + value prefer + cleanupSavepoints [driver property] Determine whether SAVEPOINTS used in AUTOSAVE will be released per query or not not required; choices [false, true] @@ -3846,6 +3851,11 @@ maxResultBuffer [driver property] not required value null +maxSendBufferSize [driver property] + Maximum amount of bytes buffered before sending to the backend + not required + value 8192 + options [driver property] Specify 'options' connection initialization parameter. not required @@ -3869,7 +3879,7 @@ PGHOST [driver property] PGPORT [driver property] Port of the PostgreSQL server (may be specified directly in the JDBC URL) not required - value 61923 + value 57774 preferQueryMode [driver property] Specifies which mode is used to execute queries to database: simple means ('Q' execute, no parse, no bind, text mode only), extended means always use bind/execute messages, extendedForPrepared means extended for prepared statements only, extendedCacheEverything means use extended protocol and try cache every statement (including Statement.execute(String sql)) in a query cache. @@ -3986,6 +3996,18 @@ sslmode [driver property] not required; choices [allow, disable, prefer, require, verify-ca, verify-full] value null +sslNegotiation [driver property] + This option controls whether the driver will perform its protocol +negotiation to request encryption from the server or will just +directly make a standard SSL connection. Traditional PostgreSQL +protocol negotiation is the default and the most flexible with +different server configurations. If the server is known to support +direct SSL connections then the latter requires one +fewer round trip reducing connection latency and also allows the use +of protocol agnostic SSL network tools. + not required; choices [direct, postgres] + value postgres + sslpassword [driver property] The password for the client's ssl key (ignored if sslpasswordcallback is set) not required diff --git a/schemacrawler-postgresql/src/test/resources/testPostgreSQL15WithConnection.LTE.txt b/schemacrawler-postgresql/src/test/resources/testPostgreSQL15WithConnection.LTE.txt index 08bbd0cba4..ae2b07e660 100644 --- a/schemacrawler-postgresql/src/test/resources/testPostgreSQL15WithConnection.LTE.txt +++ b/schemacrawler-postgresql/src/test/resources/testPostgreSQL15WithConnection.LTE.txt @@ -3,10 +3,10 @@ System Information ======================================================================== -generated by SchemaCrawler 16.20.8 -generated on 2024-01-12 23:28:38 +generated by SchemaCrawler 16.22.2 +generated on 2024-08-24 14:27:57 database version PostgreSQL 15.4 -driver version PostgreSQL JDBC Driver 42.7.1 +driver version PostgreSQL JDBC Driver 42.7.4 @@ -3652,9 +3652,9 @@ uses local files false JDBC Driver Information -=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=- -connection url jdbc:postgresql://localhost:63726/test?loggerLevel=OFF +connection url jdbc:postgresql://localhost:57889/test?loggerLevel=OFF driver name PostgreSQL JDBC Driver -driver version 42.7.1 +driver version 42.7.4 driver class name org.postgresql.Driver is JDBC compliant false supported JDBC version 4.2 @@ -3690,7 +3690,7 @@ ApplicationName [driver property] assumeMinServerVersion [driver property] Assume the server is at least that version not required - value null + value 9.1 authenticationPluginClassName [driver property] Name of class which implements AuthenticationPlugin @@ -3703,7 +3703,7 @@ autosave [driver property] value never binaryTransfer [driver property] - Use binary format for sending and receiving data if possible + Enable binary transfer for supported built-in types if possible. Setting this to false disables any binary transfer unless it's individually activated for each type with `binaryTransferEnable`. not required value true @@ -3713,7 +3713,7 @@ binaryTransferDisable [driver property] value binaryTransferEnable [driver property] - Comma separated list of types to enable binary transfer. Either OID numbers or names + Comma separated list of types to enable binary transfer. Either OID numbers or names. not required value @@ -3722,6 +3722,11 @@ cancelSignalTimeout [driver property] not required value 10 +channelBinding [driver property] + This option controls the client's use of channel binding. + not required; choices [disable, prefer, require] + value prefer + cleanupSavepoints [driver property] Determine whether SAVEPOINTS used in AUTOSAVE will be released per query or not not required; choices [false, true] @@ -3847,6 +3852,11 @@ maxResultBuffer [driver property] not required value null +maxSendBufferSize [driver property] + Maximum amount of bytes buffered before sending to the backend + not required + value 8192 + options [driver property] Specify 'options' connection initialization parameter. not required @@ -3870,7 +3880,7 @@ PGHOST [driver property] PGPORT [driver property] Port of the PostgreSQL server (may be specified directly in the JDBC URL) not required - value 63726 + value 57889 preferQueryMode [driver property] Specifies which mode is used to execute queries to database: simple means ('Q' execute, no parse, no bind, text mode only), extended means always use bind/execute messages, extendedForPrepared means extended for prepared statements only, extendedCacheEverything means use extended protocol and try cache every statement (including Statement.execute(String sql)) in a query cache. @@ -3987,6 +3997,18 @@ sslmode [driver property] not required; choices [allow, disable, prefer, require, verify-ca, verify-full] value null +sslNegotiation [driver property] + This option controls whether the driver will perform its protocol +negotiation to request encryption from the server or will just +directly make a standard SSL connection. Traditional PostgreSQL +protocol negotiation is the default and the most flexible with +different server configurations. If the server is known to support +direct SSL connections then the latter requires one +fewer round trip reducing connection latency and also allows the use +of protocol agnostic SSL network tools. + not required; choices [direct, postgres] + value postgres + sslpassword [driver property] The password for the client's ssl key (ignored if sslpasswordcallback is set) not required diff --git a/schemacrawler-postgresql/src/test/resources/testPostgreSQLWithConnection.8.txt b/schemacrawler-postgresql/src/test/resources/testPostgreSQLWithConnection.8.txt index fe2d923e5e..49e193ef6f 100644 --- a/schemacrawler-postgresql/src/test/resources/testPostgreSQLWithConnection.8.txt +++ b/schemacrawler-postgresql/src/test/resources/testPostgreSQLWithConnection.8.txt @@ -3,10 +3,10 @@ System Information ======================================================================== -generated by SchemaCrawler 16.20.8 -generated on 2024-01-12 23:08:32 +generated by SchemaCrawler 16.22.2 +generated on 2024-08-24 14:27:26 database version PostgreSQL 12.16 -driver version PostgreSQL JDBC Driver 42.7.1 +driver version PostgreSQL JDBC Driver 42.7.4 @@ -2267,9 +2267,9 @@ uses local files false JDBC Driver Information -=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=- -connection url jdbc:postgresql://localhost:61946/test?loggerLevel=OFF +connection url jdbc:postgresql://localhost:57833/test?loggerLevel=OFF driver name PostgreSQL JDBC Driver -driver version 42.7.1 +driver version 42.7.4 driver class name org.postgresql.Driver is JDBC compliant false supported JDBC version 4.2 @@ -2305,7 +2305,7 @@ ApplicationName [driver property] assumeMinServerVersion [driver property] Assume the server is at least that version not required - value null + value 9.1 authenticationPluginClassName [driver property] Name of class which implements AuthenticationPlugin @@ -2318,7 +2318,7 @@ autosave [driver property] value never binaryTransfer [driver property] - Use binary format for sending and receiving data if possible + Enable binary transfer for supported built-in types if possible. Setting this to false disables any binary transfer unless it's individually activated for each type with `binaryTransferEnable`. not required value true @@ -2328,7 +2328,7 @@ binaryTransferDisable [driver property] value binaryTransferEnable [driver property] - Comma separated list of types to enable binary transfer. Either OID numbers or names + Comma separated list of types to enable binary transfer. Either OID numbers or names. not required value @@ -2337,6 +2337,11 @@ cancelSignalTimeout [driver property] not required value 10 +channelBinding [driver property] + This option controls the client's use of channel binding. + not required; choices [disable, prefer, require] + value prefer + cleanupSavepoints [driver property] Determine whether SAVEPOINTS used in AUTOSAVE will be released per query or not not required; choices [false, true] @@ -2462,6 +2467,11 @@ maxResultBuffer [driver property] not required value null +maxSendBufferSize [driver property] + Maximum amount of bytes buffered before sending to the backend + not required + value 8192 + options [driver property] Specify 'options' connection initialization parameter. not required @@ -2485,7 +2495,7 @@ PGHOST [driver property] PGPORT [driver property] Port of the PostgreSQL server (may be specified directly in the JDBC URL) not required - value 61946 + value 57833 preferQueryMode [driver property] Specifies which mode is used to execute queries to database: simple means ('Q' execute, no parse, no bind, text mode only), extended means always use bind/execute messages, extendedForPrepared means extended for prepared statements only, extendedCacheEverything means use extended protocol and try cache every statement (including Statement.execute(String sql)) in a query cache. @@ -2602,6 +2612,18 @@ sslmode [driver property] not required; choices [allow, disable, prefer, require, verify-ca, verify-full] value null +sslNegotiation [driver property] + This option controls whether the driver will perform its protocol +negotiation to request encryption from the server or will just +directly make a standard SSL connection. Traditional PostgreSQL +protocol negotiation is the default and the most flexible with +different server configurations. If the server is known to support +direct SSL connections then the latter requires one +fewer round trip reducing connection latency and also allows the use +of protocol agnostic SSL network tools. + not required; choices [direct, postgres] + value postgres + sslpassword [driver property] The password for the client's ssl key (ignored if sslpasswordcallback is set) not required diff --git a/schemacrawler-postgresql/src/test/resources/testPostgreSQLWithConnection.LTE.txt b/schemacrawler-postgresql/src/test/resources/testPostgreSQLWithConnection.LTE.txt index b40fcb1613..d7d1edcc60 100644 --- a/schemacrawler-postgresql/src/test/resources/testPostgreSQLWithConnection.LTE.txt +++ b/schemacrawler-postgresql/src/test/resources/testPostgreSQLWithConnection.LTE.txt @@ -3,10 +3,10 @@ System Information ======================================================================== -generated by SchemaCrawler 16.20.8 -generated on 2024-01-12 23:28:47 +generated by SchemaCrawler 16.22.2 +generated on 2024-08-24 14:28:08 database version PostgreSQL 12.16 -driver version PostgreSQL JDBC Driver 42.7.1 +driver version PostgreSQL JDBC Driver 42.7.4 @@ -2268,9 +2268,9 @@ uses local files false JDBC Driver Information -=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=- -connection url jdbc:postgresql://localhost:63775/test?loggerLevel=OFF +connection url jdbc:postgresql://localhost:57913/test?loggerLevel=OFF driver name PostgreSQL JDBC Driver -driver version 42.7.1 +driver version 42.7.4 driver class name org.postgresql.Driver is JDBC compliant false supported JDBC version 4.2 @@ -2306,7 +2306,7 @@ ApplicationName [driver property] assumeMinServerVersion [driver property] Assume the server is at least that version not required - value null + value 9.1 authenticationPluginClassName [driver property] Name of class which implements AuthenticationPlugin @@ -2319,7 +2319,7 @@ autosave [driver property] value never binaryTransfer [driver property] - Use binary format for sending and receiving data if possible + Enable binary transfer for supported built-in types if possible. Setting this to false disables any binary transfer unless it's individually activated for each type with `binaryTransferEnable`. not required value true @@ -2329,7 +2329,7 @@ binaryTransferDisable [driver property] value binaryTransferEnable [driver property] - Comma separated list of types to enable binary transfer. Either OID numbers or names + Comma separated list of types to enable binary transfer. Either OID numbers or names. not required value @@ -2338,6 +2338,11 @@ cancelSignalTimeout [driver property] not required value 10 +channelBinding [driver property] + This option controls the client's use of channel binding. + not required; choices [disable, prefer, require] + value prefer + cleanupSavepoints [driver property] Determine whether SAVEPOINTS used in AUTOSAVE will be released per query or not not required; choices [false, true] @@ -2463,6 +2468,11 @@ maxResultBuffer [driver property] not required value null +maxSendBufferSize [driver property] + Maximum amount of bytes buffered before sending to the backend + not required + value 8192 + options [driver property] Specify 'options' connection initialization parameter. not required @@ -2486,7 +2496,7 @@ PGHOST [driver property] PGPORT [driver property] Port of the PostgreSQL server (may be specified directly in the JDBC URL) not required - value 63775 + value 57913 preferQueryMode [driver property] Specifies which mode is used to execute queries to database: simple means ('Q' execute, no parse, no bind, text mode only), extended means always use bind/execute messages, extendedForPrepared means extended for prepared statements only, extendedCacheEverything means use extended protocol and try cache every statement (including Statement.execute(String sql)) in a query cache. @@ -2603,6 +2613,18 @@ sslmode [driver property] not required; choices [allow, disable, prefer, require, verify-ca, verify-full] value null +sslNegotiation [driver property] + This option controls whether the driver will perform its protocol +negotiation to request encryption from the server or will just +directly make a standard SSL connection. Traditional PostgreSQL +protocol negotiation is the default and the most flexible with +different server configurations. If the server is known to support +direct SSL connections then the latter requires one +fewer round trip reducing connection latency and also allows the use +of protocol agnostic SSL network tools. + not required; choices [direct, postgres] + value postgres + sslpassword [driver property] The password for the client's ssl key (ignored if sslpasswordcallback is set) not required From afa6254ed26b1e85832fecae53f82ce02fc97c37 Mon Sep 17 00:00:00 2001 From: Sualeh Fatehi Date: Sun, 25 Aug 2024 09:31:43 -0400 Subject: [PATCH 2/4] Update Microsoft SQL Server driver --- schemacrawler-jdbc-drivers/pom.xml | 4 ++-- schemacrawler-sqlserver/pom.xml | 4 ++-- .../testSQLServerWithConnection.8.txt | 23 ++++++++----------- .../testSQLServerWithConnection.LTE.txt | 23 ++++++++----------- 4 files changed, 22 insertions(+), 32 deletions(-) diff --git a/schemacrawler-jdbc-drivers/pom.xml b/schemacrawler-jdbc-drivers/pom.xml index ae678e5700..f52ca05fe9 100644 --- a/schemacrawler-jdbc-drivers/pom.xml +++ b/schemacrawler-jdbc-drivers/pom.xml @@ -35,12 +35,12 @@ com.microsoft.sqlserver mssql-jdbc - 12.8.0.jre8 + 12.8.1.jre8 com.microsoft.sqlserver mssql-jdbc_auth - 12.8.0.x64 + 12.8.1.x64 dll diff --git a/schemacrawler-sqlserver/pom.xml b/schemacrawler-sqlserver/pom.xml index 1576f4abf4..6464a895d4 100644 --- a/schemacrawler-sqlserver/pom.xml +++ b/schemacrawler-sqlserver/pom.xml @@ -51,7 +51,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.8.0.jre8 + 12.8.1.jre8 com.microsoft.azure @@ -62,7 +62,7 @@ com.microsoft.sqlserver mssql-jdbc_auth - 12.8.0.x64 + 12.8.1.x64 dll diff --git a/schemacrawler-sqlserver/src/test/resources/testSQLServerWithConnection.8.txt b/schemacrawler-sqlserver/src/test/resources/testSQLServerWithConnection.8.txt index c6574c549e..b61ef0d593 100644 --- a/schemacrawler-sqlserver/src/test/resources/testSQLServerWithConnection.8.txt +++ b/schemacrawler-sqlserver/src/test/resources/testSQLServerWithConnection.8.txt @@ -3,10 +3,10 @@ System Information ======================================================================== -generated by SchemaCrawler 16.22.1 -generated on 2024-08-01 02:03:14 +generated by SchemaCrawler 16.22.2 +generated on 2024-08-25 13:00:42 database version Microsoft SQL Server 15.00.4102 -driver version Microsoft JDBC Driver 12.8 for SQL Server 12.8.0.0 +driver version Microsoft JDBC Driver 12.8 for SQL Server 12.8.1.0 @@ -399,7 +399,7 @@ List of book publishers Primary Key -PK__Publishe__3214EC07C65A64E4 [primary key] +PK__Publishe__3214EC078C0556CC [primary key] Id Foreign Keys @@ -409,7 +409,7 @@ FK_βιβλία_Publishers [foreign key, with no action] Indexes -PK__Publishe__3214EC07C65A64E4 [unique clustered index] +PK__Publishe__3214EC078C0556CC [unique clustered index] Id ascending Privileges and Grants @@ -816,7 +816,7 @@ Database Server Information -=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=- InstanceName null IsClustered 0 -ServerName 5c7827b9006b +ServerName 9056ab6667c7 Database Information @@ -996,9 +996,9 @@ uses local files false JDBC Driver Information -=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=- -connection url jdbc:sqlserver://localhost:65050;connectRetryInterval=10;connectRetryCount=1;maxResultBuffer=-1;sendTemporalDataTypesAsStringForBulkCopy=true;delayLoadingLobs=true;useFmtOnly=false;cacheBulkCopyMetadata=false;useBulkCopyForBatchInsert=false;cancelQueryTimeout=-1;sslProtocol=TLS;calcBigDecimalPrecision=false;useDefaultJaasConfig=false;jaasConfigurationName=SQLJDBCDriver;statementPoolingCacheSize=0;serverPreparedStatementDiscardThreshold=10;enablePrepareOnFirstPreparedStatementCall=false;fips=false;socketTimeout=0;authentication=NotSpecified;authenticationScheme=nativeAuthentication;xopenStates=false;datetimeParameterType=datetime2;sendTimeAsDatetime=true;replication=false;trustStoreType=JKS;trustServerCertificate=false;TransparentNetworkIPResolution=true;iPAddressPreference=IPv4First;serverNameAsACE=false;sendStringParametersAsUnicode=true;selectMethod=direct;responseBuffering=adaptive;queryTimeout=-1;packetSize=8000;multiSubnetFailover=false;loginTimeout=30;lockTimeout=-1;lastUpdateCount=true;useFlexibleCallableStatements=true;useDefaultGSSCredential=false;prepareMethod=prepexec;encrypt=false;disableStatementPooling=true;databaseName=BOOKS;columnEncryptionSetting=Disabled;applicationName=Microsoft JDBC Driver for SQL Server;applicationIntent=readwrite; +connection url jdbc:sqlserver://localhost:57900;connectRetryInterval=10;connectRetryCount=1;maxResultBuffer=-1;sendTemporalDataTypesAsStringForBulkCopy=true;delayLoadingLobs=true;useFmtOnly=false;cacheBulkCopyMetadata=false;useBulkCopyForBatchInsert=false;cancelQueryTimeout=-1;sslProtocol=TLS;calcBigDecimalPrecision=false;useDefaultJaasConfig=false;jaasConfigurationName=SQLJDBCDriver;statementPoolingCacheSize=0;serverPreparedStatementDiscardThreshold=10;enablePrepareOnFirstPreparedStatementCall=false;fips=false;socketTimeout=0;authentication=NotSpecified;authenticationScheme=nativeAuthentication;xopenStates=false;datetimeParameterType=datetime2;sendTimeAsDatetime=true;replication=false;trustStoreType=JKS;trustServerCertificate=false;TransparentNetworkIPResolution=true;iPAddressPreference=IPv4First;serverNameAsACE=false;sendStringParametersAsUnicode=true;selectMethod=direct;responseBuffering=adaptive;queryTimeout=-1;packetSize=8000;multiSubnetFailover=false;loginTimeout=30;lockTimeout=-1;lastUpdateCount=true;useDefaultGSSCredential=false;prepareMethod=prepexec;encrypt=false;disableStatementPooling=true;databaseName=BOOKS;columnEncryptionSetting=Disabled;applicationName=Microsoft JDBC Driver for SQL Server;applicationIntent=readwrite; driver name Microsoft JDBC Driver 12.8 for SQL Server -driver version 12.8.0.0 +driver version 12.8.1.0 driver class name com.microsoft.sqlserver.jdbc.SQLServerDriver is JDBC compliant true supported JDBC version 4.2 @@ -1244,7 +1244,7 @@ password [driver property] portNumber [driver property] The TCP port where an instance of SQL Server is listening. not required - value 65050 + value 57900 prepareMethod [driver property] Determines the prepare method used in the driver. @@ -1391,11 +1391,6 @@ useDefaultJaasConfig [driver property] not required; choices [false, true] value false -useFlexibleCallableStatements [driver property] - Indicates whether sp_sproc_columns will be used for parameter name lookup when setting or registering parameters for callable statements. - not required; choices [false, true] - value true - useFmtOnly [driver property] Determines whether to enable/disable use of SET FMTONLY to retrieve parameter metadata. not required; choices [false, true] diff --git a/schemacrawler-sqlserver/src/test/resources/testSQLServerWithConnection.LTE.txt b/schemacrawler-sqlserver/src/test/resources/testSQLServerWithConnection.LTE.txt index 3ba3ccd3da..0dec202837 100644 --- a/schemacrawler-sqlserver/src/test/resources/testSQLServerWithConnection.LTE.txt +++ b/schemacrawler-sqlserver/src/test/resources/testSQLServerWithConnection.LTE.txt @@ -3,10 +3,10 @@ System Information ======================================================================== -generated by SchemaCrawler 16.22.1 -generated on 2024-08-01 02:04:16 +generated by SchemaCrawler 16.22.2 +generated on 2024-08-25 13:29:56 database version Microsoft SQL Server 15.00.4102 -driver version Microsoft JDBC Driver 12.8 for SQL Server 12.8.0.0 +driver version Microsoft JDBC Driver 12.8 for SQL Server 12.8.1.0 @@ -399,7 +399,7 @@ List of book publishers Primary Key -PK__Publishe__3214EC07E1463C7B [primary key] +PK__Publishe__3214EC07D40C7C4A [primary key] Id Foreign Keys @@ -409,7 +409,7 @@ FK_βιβλία_Publishers [foreign key, with no action] Indexes -PK__Publishe__3214EC07E1463C7B [unique clustered index] +PK__Publishe__3214EC07D40C7C4A [unique clustered index] Id ascending Privileges and Grants @@ -816,7 +816,7 @@ Database Server Information -=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=- InstanceName null IsClustered 0 -ServerName b69d45ef3e9c +ServerName ac38eeebae5c Database Information @@ -997,9 +997,9 @@ uses local files false JDBC Driver Information -=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=- -connection url jdbc:sqlserver://localhost:49228;connectRetryInterval=10;connectRetryCount=1;maxResultBuffer=-1;sendTemporalDataTypesAsStringForBulkCopy=true;delayLoadingLobs=true;useFmtOnly=false;cacheBulkCopyMetadata=false;useBulkCopyForBatchInsert=false;cancelQueryTimeout=-1;sslProtocol=TLS;calcBigDecimalPrecision=false;useDefaultJaasConfig=false;jaasConfigurationName=SQLJDBCDriver;statementPoolingCacheSize=0;serverPreparedStatementDiscardThreshold=10;enablePrepareOnFirstPreparedStatementCall=false;fips=false;socketTimeout=0;authentication=NotSpecified;authenticationScheme=nativeAuthentication;xopenStates=false;datetimeParameterType=datetime2;sendTimeAsDatetime=true;replication=false;trustStoreType=JKS;trustServerCertificate=false;TransparentNetworkIPResolution=true;iPAddressPreference=IPv4First;serverNameAsACE=false;sendStringParametersAsUnicode=true;selectMethod=direct;responseBuffering=adaptive;queryTimeout=-1;packetSize=8000;multiSubnetFailover=false;loginTimeout=30;lockTimeout=-1;lastUpdateCount=true;useFlexibleCallableStatements=true;useDefaultGSSCredential=false;prepareMethod=prepexec;encrypt=false;disableStatementPooling=true;databaseName=BOOKS;columnEncryptionSetting=Disabled;applicationName=Microsoft JDBC Driver for SQL Server;applicationIntent=readwrite; +connection url jdbc:sqlserver://localhost:59138;connectRetryInterval=10;connectRetryCount=1;maxResultBuffer=-1;sendTemporalDataTypesAsStringForBulkCopy=true;delayLoadingLobs=true;useFmtOnly=false;cacheBulkCopyMetadata=false;useBulkCopyForBatchInsert=false;cancelQueryTimeout=-1;sslProtocol=TLS;calcBigDecimalPrecision=false;useDefaultJaasConfig=false;jaasConfigurationName=SQLJDBCDriver;statementPoolingCacheSize=0;serverPreparedStatementDiscardThreshold=10;enablePrepareOnFirstPreparedStatementCall=false;fips=false;socketTimeout=0;authentication=NotSpecified;authenticationScheme=nativeAuthentication;xopenStates=false;datetimeParameterType=datetime2;sendTimeAsDatetime=true;replication=false;trustStoreType=JKS;trustServerCertificate=false;TransparentNetworkIPResolution=true;iPAddressPreference=IPv4First;serverNameAsACE=false;sendStringParametersAsUnicode=true;selectMethod=direct;responseBuffering=adaptive;queryTimeout=-1;packetSize=8000;multiSubnetFailover=false;loginTimeout=30;lockTimeout=-1;lastUpdateCount=true;useDefaultGSSCredential=false;prepareMethod=prepexec;encrypt=false;disableStatementPooling=true;databaseName=BOOKS;columnEncryptionSetting=Disabled;applicationName=Microsoft JDBC Driver for SQL Server;applicationIntent=readwrite; driver name Microsoft JDBC Driver 12.8 for SQL Server -driver version 12.8.0.0 +driver version 12.8.1.0 driver class name com.microsoft.sqlserver.jdbc.SQLServerDriver is JDBC compliant true supported JDBC version 4.2 @@ -1245,7 +1245,7 @@ password [driver property] portNumber [driver property] The TCP port where an instance of SQL Server is listening. not required - value 49228 + value 59138 prepareMethod [driver property] Determines the prepare method used in the driver. @@ -1392,11 +1392,6 @@ useDefaultJaasConfig [driver property] not required; choices [false, true] value false -useFlexibleCallableStatements [driver property] - Indicates whether sp_sproc_columns will be used for parameter name lookup when setting or registering parameters for callable statements. - not required; choices [false, true] - value true - useFmtOnly [driver property] Determines whether to enable/disable use of SET FMTONLY to retrieve parameter metadata. not required; choices [false, true] From 3b41cec716fab512ad8254ae11ae87ceb3fcdae2 Mon Sep 17 00:00:00 2001 From: Sualeh Fatehi Date: Sun, 25 Aug 2024 14:12:50 -0400 Subject: [PATCH 3/4] Update Jython --- .../src/examples/resources/_downloader/python_ivy.xml | 2 +- schemacrawler-scripting/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/schemacrawler-distrib/src/examples/resources/_downloader/python_ivy.xml b/schemacrawler-distrib/src/examples/resources/_downloader/python_ivy.xml index 23931af934..8b82259dcc 100644 --- a/schemacrawler-distrib/src/examples/resources/_downloader/python_ivy.xml +++ b/schemacrawler-distrib/src/examples/resources/_downloader/python_ivy.xml @@ -8,7 +8,7 @@ + rev="2.7.4" conf="binaries->default" /> diff --git a/schemacrawler-scripting/pom.xml b/schemacrawler-scripting/pom.xml index 9beabd3e60..e5b9df4f63 100644 --- a/schemacrawler-scripting/pom.xml +++ b/schemacrawler-scripting/pom.xml @@ -108,7 +108,7 @@ org.python jython-slim - 2.7.3 + 2.7.4 provided From 3d24fd02e8391c191046c513e6e3ca4bb927972b Mon Sep 17 00:00:00 2001 From: Sualeh Fatehi Date: Sun, 25 Aug 2024 14:17:08 -0400 Subject: [PATCH 4/4] Update >maven-deploy-plugin --- schemacrawler-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemacrawler-parent/pom.xml b/schemacrawler-parent/pom.xml index b65536eb5a..95dff7f2ce 100644 --- a/schemacrawler-parent/pom.xml +++ b/schemacrawler-parent/pom.xml @@ -286,7 +286,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.2 + 3.1.3 org.sonatype.plugins