Skip to content

Commit

Permalink
Merge pull request #1587 from schemacrawler/updates
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
sualeh committed Jun 17, 2024
2 parents bcc6377 + 1413ac0 commit 91064b9
Show file tree
Hide file tree
Showing 161 changed files with 11,487 additions and 11,487 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ public void connectionInfoBuilder(final Connection connection) throws SQLExcepti
matchesPattern("jdbc:hsqldb:hsql://\\d*\\.\\d*\\.\\d*\\.\\d*:\\d*/schemacrawler\\d*"));

assertThat(databaseInfo.getDatabaseProductName(), is("HSQL Database Engine"));
assertThat(databaseInfo.getDatabaseProductVersion(), is("2.7.2"));
assertThat(databaseInfo.getDatabaseProductVersion(), is("2.7.3"));

assertThat(jdbcDriverInfo.getDriverClassName(), is("org.hsqldb.jdbc.JDBCDriver"));
assertThat(jdbcDriverInfo.getDriverMajorVersion(), is(2));
assertThat(jdbcDriverInfo.getDriverMinorVersion(), is(7));
assertThat(jdbcDriverInfo.getDriverName(), is("HSQL Database Engine Driver"));
assertThat(jdbcDriverInfo.getDriverVersion(), is("2.7.2"));
assertThat(jdbcDriverInfo.getDriverVersion(), is("2.7.3"));

assertThat(jdbcDriverInfo.getJdbcMajorVersion(), is(4));
assertThat(jdbcDriverInfo.getJdbcMinorVersion(), is(2));
Expand All @@ -91,7 +91,7 @@ public void connectionInfoBuilderException(final Connection connection) throws S
assertThat(jdbcDriverInfo.getDriverMajorVersion(), is(2));
assertThat(jdbcDriverInfo.getDriverMinorVersion(), is(7));
assertThat(jdbcDriverInfo.getDriverName(), is("HSQL Database Engine Driver"));
assertThat(jdbcDriverInfo.getDriverVersion(), is("2.7.2"));
assertThat(jdbcDriverInfo.getDriverVersion(), is("2.7.3"));

assertThat(databaseInfo.getUserName(), is(""));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public void databaseInfo(final TestContext testContext, final Connection connect

assertThat(
catalog.getDatabaseInfo().toString(),
is("-- database: HSQL Database Engine 2.7.2" + System.lineSeparator()));
is("-- database: HSQL Database Engine 2.7.3" + System.lineSeparator()));
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private void verifyJdbcDriverInfoRetrieval() throws SQLException {

final JdbcDriverInfo jdbcDriverInfo = catalog.getJdbcDriverInfo();
assertThat(jdbcDriverInfo.getProductName(), is("HSQL Database Engine Driver"));
assertThat(jdbcDriverInfo.getProductVersion(), is("2.7.2"));
assertThat(jdbcDriverInfo.getProductVersion(), is("2.7.3"));

final List<Property> driverProperties = new ArrayList<>(jdbcDriverInfo.getDriverProperties());
assertThat(driverProperties, hasSize(0));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public void jdbcDriverInfoProperties() throws Exception {
jdbcDriverInfo.toString(),
matchesPattern(
Pattern.compile(
"-- driver: HSQL Database Engine Driver 2.7.2\\R"
"-- driver: HSQL Database Engine Driver 2.7.3\\R"
+ "-- driver class: org.hsqldb.jdbc.JDBCDriver\\R"
+ "-- url: jdbc:hsqldb:hsql:\\/\\/0.0.0.0:\\d*/schemacrawler\\d*\\R",
Pattern.DOTALL)));
Expand Down
37 changes: 17 additions & 20 deletions schemacrawler-api/src/test/java/schemacrawler/test/SortingTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,9 @@
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.notNullValue;
import static schemacrawler.test.utility.DatabaseTestUtility.getCatalog;

import java.sql.Connection;
import java.util.Arrays;

import org.junit.jupiter.api.Test;

import schemacrawler.schema.Catalog;
import schemacrawler.schema.Column;
import schemacrawler.schema.ForeignKey;
Expand All @@ -58,17 +55,17 @@ public class SortingTest {
public void columnSort(final Connection connection) throws Exception {

final String[] sortedNatural =
new String[] {
"ID",
"FIRSTNAME",
"LASTNAME",
"ADDRESS1",
"ADDRESS2",
"CITY",
"STATE",
"POSTALCODE",
"COUNTRY",
};
{
"ID",
"FIRSTNAME",
"LASTNAME",
"ADDRESS1",
"ADDRESS2",
"CITY",
"STATE",
"POSTALCODE",
"COUNTRY",
};

final String[] sortedAlpha = Arrays.copyOf(sortedNatural, sortedNatural.length);
Arrays.sort(sortedAlpha);
Expand All @@ -81,9 +78,9 @@ public void columnSort(final Connection connection) throws Exception {
public void fkSort(final Connection connection) throws Exception {

final String[] sortedNatural =
new String[] {
"Z_FK_AUTHOR", "SYS_FK_10120",
};
{
"Z_FK_AUTHOR", "SYS_FK_10118",
};

final String[] sortedAlpha = Arrays.copyOf(sortedNatural, sortedNatural.length);
Arrays.sort(sortedAlpha);
Expand All @@ -96,9 +93,9 @@ public void fkSort(final Connection connection) throws Exception {
public void indexSort(final Connection connection) throws Exception {

final String[] sortedNatural =
new String[] {
"PK_AUTHORS", "IDX_B_AUTHORS", "IDX_A_AUTHORS",
};
{
"PK_AUTHORS", "IDX_B_AUTHORS", "IDX_A_AUTHORS",
};
final String[] sortedAlpha = Arrays.copyOf(sortedNatural, sortedNatural.length);
Arrays.sort(sortedAlpha);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
username=SA
product name=HSQL Database Engine
product version=2.7.2
product version=2.7.3
catalog=catalog
all procedures are callable = true
all tables are selectable = true
Expand Down Expand Up @@ -166,7 +166,7 @@ updates are detected for TYPE_SCROLL_INSENSITIVE result sets = false
updates are detected for TYPE_SCROLL_SENSITIVE result sets = false
uses local file per table = false
uses local files = false
connection url=jdbc:hsqldb:hsql://0.0.0.0:56781/schemacrawler56781
connection url=jdbc:hsqldb:hsql://0.0.0.0:64141/schemacrawler64141
driver class=org.hsqldb.jdbc.JDBCDriver
default_schema = false
is required? false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
username=SA
product name=HSQL Database Engine
product version=2.7.2
product version=2.7.3
catalog=catalog
all procedures are callable = true
all tables are selectable = true
Expand Down Expand Up @@ -167,7 +167,7 @@ updates are detected for TYPE_SCROLL_INSENSITIVE result sets = false
updates are detected for TYPE_SCROLL_SENSITIVE result sets = false
uses local file per table = false
uses local files = false
connection url=jdbc:hsqldb:hsql://0.0.0.0:56512/schemacrawler56512
connection url=jdbc:hsqldb:hsql://0.0.0.0:59194/schemacrawler59194
driver class=org.hsqldb.jdbc.JDBCDriver
default_schema = false
is required? false
Expand Down
1 change: 1 addition & 0 deletions schemacrawler-api/src/test/resources/table_types/all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,7 @@ PUBLIC.INFORMATION_SCHEMA
ALLOCATED_SPACE [PUBLIC.INFORMATION_SCHEMA.CARDINAL_NUMBER]
SPACE_ID [PUBLIC.INFORMATION_SCHEMA.CARDINAL_NUMBER]
BASE_SPACE [PUBLIC.INFORMATION_SCHEMA.CARDINAL_NUMBER]
VERSION [PUBLIC.INFORMATION_SCHEMA.CARDINAL_NUMBER]
SYSTEM_KEY_INDEX_USAGE [system table]
CONSTRAINT_CATALOG [PUBLIC.INFORMATION_SCHEMA.SQL_IDENTIFIER]
CONSTRAINT_SCHEMA [PUBLIC.INFORMATION_SCHEMA.SQL_IDENTIFIER]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -689,6 +689,7 @@ PUBLIC.INFORMATION_SCHEMA
ALLOCATED_SPACE [PUBLIC.INFORMATION_SCHEMA.CARDINAL_NUMBER]
SPACE_ID [PUBLIC.INFORMATION_SCHEMA.CARDINAL_NUMBER]
BASE_SPACE [PUBLIC.INFORMATION_SCHEMA.CARDINAL_NUMBER]
VERSION [PUBLIC.INFORMATION_SCHEMA.CARDINAL_NUMBER]
SYSTEM_KEY_INDEX_USAGE [system table]
CONSTRAINT_CATALOG [PUBLIC.INFORMATION_SCHEMA.SQL_IDENTIFIER]
CONSTRAINT_SCHEMA [PUBLIC.INFORMATION_SCHEMA.SQL_IDENTIFIER]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SchemaCrawler 16.18.2
SchemaCrawler 16.21.3

Error: No tables SQL provided

Expand All @@ -17,9 +17,9 @@ https://killercoda.com/schemacrawler


Environment:
SchemaCrawler 16.18.2
SchemaCrawler 16.21.3
Windows 10 10.0
Oracle Corporation Java HotSpot(TM) 64-Bit Server VM 1.8.0_301-b09
HSQL Database Engine 2.7.2
HSQL Database Engine Driver 2.7.2
Oracle Corporation Java HotSpot(TM) 64-Bit Server VM 1.8.0_151-b12
HSQL Database Engine 2.7.3
HSQL Database Engine Driver 2.7.3

Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ digraph "SchemaCrawler_Diagram" {
<table border="1" cellborder="0" cellspacing="0" color="#888888">
<tr>
<td align='right'>generated by</td>
<td align='left'>SchemaCrawler 16.18.2</td>
<td align='left'>SchemaCrawler 16.21.3</td>
</tr>
<tr>
<td align='right'>generated on</td>
<td align='left'>2022-10-24 16:39:40</td>
<td align='left'>2024-06-17 01:18:47</td>
</tr>
<tr>
<td align='right'>database version</td>
<td align='left'>HSQL Database Engine 2.7.2</td>
<td align='left'>HSQL Database Engine 2.7.3</td>
</tr>
</table>
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ digraph "SchemaCrawler_Diagram" {
<table border="1" cellborder="0" cellspacing="0" color="#888888">
<tr>
<td align='right'>generated by</td>
<td align='left'>SchemaCrawler 16.18.2</td>
<td align='left'>SchemaCrawler 16.21.3</td>
</tr>
<tr>
<td align='right'>generated on</td>
<td align='left'>2022-10-24 16:39:40</td>
<td align='left'>2024-06-17 01:18:47</td>
</tr>
<tr>
<td align='right'>database version</td>
<td align='left'>HSQL Database Engine 2.7.2</td>
<td align='left'>HSQL Database Engine 2.7.3</td>
</tr>
</table>
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ digraph "SchemaCrawler_Diagram" {
<table border="1" cellborder="0" cellspacing="0" color="#888888">
<tr>
<td align='right'>generated by</td>
<td align='left'>SchemaCrawler 16.18.2</td>
<td align='left'>SchemaCrawler 16.21.3</td>
</tr>
<tr>
<td align='right'>generated on</td>
<td align='left'>2022-10-24 16:39:41</td>
<td align='left'>2024-06-17 01:18:47</td>
</tr>
<tr>
<td align='right'>database version</td>
<td align='left'>HSQL Database Engine 2.7.2</td>
<td align='left'>HSQL Database Engine 2.7.3</td>
</tr>
</table>
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ digraph "SchemaCrawler_Diagram" {
<table border="1" cellborder="0" cellspacing="0" color="#888888">
<tr>
<td align='right'>generated by</td>
<td align='left'>SchemaCrawler 16.18.2</td>
<td align='left'>SchemaCrawler 16.21.3</td>
</tr>
<tr>
<td align='right'>generated on</td>
<td align='left'>2022-10-24 16:39:41</td>
<td align='left'>2024-06-17 01:18:48</td>
</tr>
<tr>
<td align='right'>database version</td>
<td align='left'>HSQL Database Engine 2.7.2</td>
<td align='left'>HSQL Database Engine 2.7.3</td>
</tr>
</table>
>
Expand Down
Loading

0 comments on commit 91064b9

Please sign in to comment.