Skip to content

Commit fcf08f3

Browse files
sualehsualeh
committed
v16.20.6
1 parent 1aa79ef commit fcf08f3

File tree

10 files changed

+385
-72
lines changed

10 files changed

+385
-72
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>us.fatehi</groupId>
88
<artifactId>schemacrawler-parent</artifactId>
9-
<version>16.20.5</version>
9+
<version>16.20.6</version>
1010
</parent>
1111
<artifactId>schemacrawler-database-plugins-parent</artifactId>
1212
<packaging>pom</packaging>

‎schemacrawler-cassandra/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>us.fatehi</groupId>
88
<artifactId>schemacrawler-parent</artifactId>
9-
<version>16.20.5</version>
9+
<version>16.20.6</version>
1010
</parent>
1111
<artifactId>schemacrawler-cassandra</artifactId>
1212
<packaging>jar</packaging>
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>com.ing.data</groupId>
4343
<artifactId>cassandra-jdbc-wrapper</artifactId>
44-
<version>4.8.0</version>
44+
<version>4.10.2</version>
4545
</dependency>
4646

4747
<dependency>

‎schemacrawler-cassandra/src/test/java/schemacrawler/integration/test/CassandraTest.java‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,8 @@
3434
import static schemacrawler.test.utility.FileHasContent.hasSameContentAs;
3535
import static schemacrawler.test.utility.FileHasContent.outputOf;
3636
import static schemacrawler.test.utility.TestUtility.javaVersion;
37-
3837
import java.net.InetSocketAddress;
3938
import java.util.regex.Pattern;
40-
4139
import org.junit.jupiter.api.BeforeEach;
4240
import org.junit.jupiter.api.Test;
4341
import org.junit.jupiter.api.TestInstance;
@@ -46,7 +44,6 @@
4644
import org.testcontainers.junit.jupiter.Container;
4745
import org.testcontainers.junit.jupiter.Testcontainers;
4846
import org.testcontainers.utility.DockerImageName;
49-
5047
import schemacrawler.schemacrawler.InfoLevel;
5148
import schemacrawler.schemacrawler.LimitOptionsBuilder;
5249
import schemacrawler.schemacrawler.LoadOptionsBuilder;
@@ -66,7 +63,7 @@ public class CassandraTest extends BaseAdditionalDatabaseTest {
6663

6764
@Container
6865
private final CassandraContainer<?> dbContainer =
69-
new CassandraContainer<>(imageName.withTag("4.1.0"))
66+
new CassandraContainer<>(imageName.withTag("5.0"))
7067
.withInitScript("create-cassandra-database.cql");
7168

7269
@BeforeEach
@@ -79,8 +76,10 @@ public void createDatabase() {
7976
final InetSocketAddress contactPoint = dbContainer.getContactPoint();
8077
final String host = contactPoint.getHostName();
8178
final int port = contactPoint.getPort();
82-
final String keyspace = "store";
83-
final String connectionUrl = String.format("jdbc:cassandra://%s:%d/%s", host, port, keyspace);
79+
final String keyspace = "books";
80+
final String localDatacenter = dbContainer.getLocalDatacenter();
81+
final String connectionUrl = String.format("jdbc:cassandra://%s:%d/%s?localdatacenter=%s", host,
82+
port, keyspace, localDatacenter);
8483
System.out.printf("url=%s%n", connectionUrl);
8584
createDataSource(connectionUrl, dbContainer.getUsername(), dbContainer.getPassword());
8685
}
@@ -94,10 +93,9 @@ public void testCassandraWithConnection() throws Exception {
9493
SchemaInfoLevelBuilder.builder().withInfoLevel(InfoLevel.maximum);
9594
final LoadOptionsBuilder loadOptionsBuilder =
9695
LoadOptionsBuilder.builder().withSchemaInfoLevelBuilder(schemaInfoLevelBuilder);
97-
final SchemaCrawlerOptions schemaCrawlerOptions =
98-
SchemaCrawlerOptionsBuilder.newSchemaCrawlerOptions()
99-
.withLimitOptions(limitOptionsBuilder.toOptions())
100-
.withLoadOptions(loadOptionsBuilder.toOptions());
96+
final SchemaCrawlerOptions schemaCrawlerOptions = SchemaCrawlerOptionsBuilder
97+
.newSchemaCrawlerOptions().withLimitOptions(limitOptionsBuilder.toOptions())
98+
.withLoadOptions(loadOptionsBuilder.toOptions());
10199
final SchemaTextOptionsBuilder textOptionsBuilder = SchemaTextOptionsBuilder.builder();
102100
textOptionsBuilder.showDatabaseInfo().showJdbcDriverInfo();
103101
final SchemaTextOptions textOptions = textOptionsBuilder.toOptions();
@@ -108,8 +106,7 @@ public void testCassandraWithConnection() throws Exception {
108106

109107
final String expectedResource =
110108
String.format("testCassandraWithConnection.%s.txt", javaVersion());
111-
assertThat(
112-
outputOf(executableExecution(getDataSource(), executable)),
109+
assertThat(outputOf(executableExecution(getDataSource(), executable)),
113110
hasSameContentAs(classpathResource(expectedResource)));
114111
}
115112
}

‎schemacrawler-cassandra/src/test/resources/testCassandraWithConnection.8.txt‎

Lines changed: 184 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
System Information
44
========================================================================
55

6-
generated by SchemaCrawler 16.19.5
7-
generated on 2023-01-06 23:43:39
8-
database version Cassandra 4.1.0
9-
driver version Cassandra JDBC Driver 4.4.0
6+
generated by SchemaCrawler 16.20.5
7+
generated on 2023-11-11 20:53:16
8+
database version Cassandra 5.0.0
9+
driver version Cassandra JDBC Driver 4.10.2
1010

1111

1212

@@ -18,23 +18,14 @@ Tables
1818
books.authors [table]
1919
------------------------------------------------------------------------
2020
id UUID NOT NULL
21-
id=DefaultColumnMetadata@220979a5(books.authors.id uuid)
2221
address1 TEXT NOT NULL
23-
address1=DefaultColumnMetadata@71c66ee6(books.authors.address1 text)
2422
address2 TEXT NOT NULL
25-
address2=DefaultColumnMetadata@71c672a7(books.authors.address2 text)
2623
city TEXT NOT NULL
27-
city=DefaultColumnMetadata@d0c63214(books.authors.city text)
2824
country TEXT NOT NULL
29-
country=DefaultColumnMetadata@7278117f(books.authors.country text)
3025
firstname TEXT NOT NULL
31-
firstname=DefaultColumnMetadata@114959e4(books.authors.firstname text)
3226
lastname TEXT NOT NULL
33-
lastname=DefaultColumnMetadata@c27b154a(books.authors.lastname text)
3427
postalcode TEXT NOT NULL
35-
postalcode=DefaultColumnMetadata@576826a1(books.authors.postalcode text)
3628
state TEXT NOT NULL
37-
state=DefaultColumnMetadata@b0c42bba(books.authors.state text)
3829

3930
Primary Key
4031

@@ -51,6 +42,174 @@ idx_b_authors [non-unique hashed index]
5142
Data Types
5243
========================================================================
5344

45+
ascii [data type]
46+
defined with no parameters
47+
nullable
48+
not auto-incrementable
49+
searchable except with where .. like
50+
51+
bigint [data type]
52+
defined with no parameters
53+
nullable
54+
not auto-incrementable
55+
searchable except with where .. like
56+
57+
blob [data type]
58+
defined with no parameters
59+
nullable
60+
not auto-incrementable
61+
searchable except with where .. like
62+
63+
boolean [data type]
64+
defined with no parameters
65+
nullable
66+
not auto-incrementable
67+
searchable except with where .. like
68+
69+
counter [data type]
70+
defined with no parameters
71+
nullable
72+
not auto-incrementable
73+
searchable except with where .. like
74+
75+
CUSTOM [data type]
76+
defined with no parameters
77+
nullable
78+
not auto-incrementable
79+
searchable except with where .. like
80+
81+
date [data type]
82+
defined with no parameters
83+
nullable
84+
not auto-incrementable
85+
searchable except with where .. like
86+
87+
decimal [data type]
88+
defined with no parameters
89+
nullable
90+
not auto-incrementable
91+
searchable except with where .. like
92+
93+
double [data type]
94+
defined with no parameters
95+
nullable
96+
not auto-incrementable
97+
searchable except with where .. like
98+
99+
duration [data type]
100+
defined with no parameters
101+
nullable
102+
not auto-incrementable
103+
searchable except with where .. like
104+
105+
float [data type]
106+
defined with no parameters
107+
nullable
108+
not auto-incrementable
109+
searchable except with where .. like
110+
111+
inet [data type]
112+
defined with no parameters
113+
nullable
114+
not auto-incrementable
115+
searchable except with where .. like
116+
117+
int [data type]
118+
defined with no parameters
119+
nullable
120+
not auto-incrementable
121+
searchable except with where .. like
122+
123+
list [data type]
124+
defined with no parameters
125+
nullable
126+
not auto-incrementable
127+
searchable except with where .. like
128+
129+
map [data type]
130+
defined with no parameters
131+
nullable
132+
not auto-incrementable
133+
searchable except with where .. like
134+
135+
set [data type]
136+
defined with no parameters
137+
nullable
138+
not auto-incrementable
139+
searchable except with where .. like
140+
141+
smallint [data type]
142+
defined with no parameters
143+
nullable
144+
not auto-incrementable
145+
searchable except with where .. like
146+
147+
text [data type]
148+
defined with no parameters
149+
nullable
150+
not auto-incrementable
151+
searchable except with where .. like
152+
153+
time [data type]
154+
defined with no parameters
155+
nullable
156+
not auto-incrementable
157+
searchable except with where .. like
158+
159+
timestamp [data type]
160+
defined with no parameters
161+
nullable
162+
not auto-incrementable
163+
searchable except with where .. like
164+
165+
timeuuid [data type]
166+
defined with no parameters
167+
nullable
168+
not auto-incrementable
169+
searchable except with where .. like
170+
171+
tinyint [data type]
172+
defined with no parameters
173+
nullable
174+
not auto-incrementable
175+
searchable except with where .. like
176+
177+
tuple [data type]
178+
defined with no parameters
179+
nullable
180+
not auto-incrementable
181+
searchable except with where .. like
182+
183+
UDT [data type]
184+
defined with no parameters
185+
nullable
186+
not auto-incrementable
187+
searchable except with where .. like
188+
189+
uuid [data type]
190+
defined with no parameters
191+
nullable
192+
not auto-incrementable
193+
searchable except with where .. like
194+
195+
VARCHAR [data type]
196+
defined with no parameters
197+
nullable
198+
not auto-incrementable
199+
searchable except with where .. like
200+
201+
varint [data type]
202+
defined with no parameters
203+
nullable
204+
not auto-incrementable
205+
searchable except with where .. like
206+
207+
Vector [data type]
208+
defined with no parameters
209+
nullable
210+
not auto-incrementable
211+
searchable except with where .. like
212+
54213
books.TEXT [user defined data type]
55214
defined with no parameters
56215
not nullable
@@ -74,7 +233,7 @@ System Information
74233
Database Information
75234
-=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=-
76235
database product name Cassandra
77-
database product version 4.1.0
236+
database product version 5.0.0
78237
database user name cassandra
79238

80239

@@ -85,19 +244,18 @@ all tables are selectable true
85244
auto commit failure closes all result sets false
86245
catalog separator
87246
catalog term Cluster
88-
catalogs
89-
client info properties
247+
catalogs Test Cluster
90248
data definition causes transaction commit false
91249
data definition ignored in transactions false
92-
database major version 4
93-
database minor version 1
250+
database major version 5
251+
database minor version 0
94252
default transaction isolation 0
95253
deletes are detected for TYPE_FORWARD_ONLY result sets false
96254
deletes are detected for TYPE_SCROLL_INSENSITIVE result sets false
97255
deletes are detected for TYPE_SCROLL_SENSITIVE result sets false
98256
does max row size include blobs false
99257
driver major version 4
100-
driver minor version 4
258+
driver minor version 10
101259
extra name characters
102260
generated key always returned false
103261
identifier quote string
@@ -135,7 +293,7 @@ nulls are sorted at end false
135293
nulls are sorted at start true
136294
nulls are sorted high true
137295
nulls are sorted low false
138-
numeric functions
296+
numeric functions similarity_cosine, similarity_euclidean, similarity_dot_product
139297
others deletes are visible for TYPE_FORWARD_ONLY result sets false
140298
others deletes are visible for TYPE_SCROLL_INSENSITIVE result sets false
141299
others deletes are visible for TYPE_SCROLL_SENSITIVE result sets false
@@ -160,7 +318,7 @@ row id lifetime ROWID_UNSUPPORTED
160318
schema term Keyspace
161319
schemas books
162320
search string escape \
163-
SQL keywords
321+
SQL keywords AGGREGATE, ALLOW, ANN OF, APPLY, ASCII, AUTHORIZE, BATCH, CLUSTERING, COLUMNFAMILY, COMPACT, COUNTER, CUSTOM, ENTRIES, FILTERING, FINALFUNC, FROZEN, FUNCTIONS, IF, INDEX, INET, INFINITY, INITCOND, JSON, KEYS, KEYSPACE, KEYSPACES, LIMIT, LIST, LOGIN, MODIFY, NAN, NOLOGIN, NORECURSIVE, NOSUPERUSER, PASSWORD, PERMISSION, PERMISSIONS, RENAME, REPLACE, RETURNS, ROLES, SFUNC, SMALLINT, STORAGE, STYPE, SUPERUSER, TEXT, TIMEUUID, TINYINT, TOKEN, TRUNCATE, TTL, TUPLE, UNLOGGED, USE, USERS, UUID, VARINT, VECTOR, WRITETIME
164322
SQL state type 2
165323
stores lower case identifiers false
166324
stores lower case quoted identifiers false
@@ -235,10 +393,10 @@ supports table correlation names false
235393
supports transactions false
236394
supports union false
237395
supports union all false
238-
system functions
396+
system functions TOKEN, TTL, WRITETIME
239397
table types TABLE
240-
time date functions
241-
type info
398+
time date functions dateOf, now, minTimeuuid, maxTimeuuid, unixTimestampOf, toDate, toTimestamp, toUnixTimestamp, currentTimestamp, currentDate, currentTime, currentTimeUUID
399+
type info CUSTOM, UDT, VARCHAR, Vector, ascii, bigint, blob, boolean, counter, date, decimal, double, duration, float, inet, int, list, map, set, smallint, text, time, timestamp, timeuuid, tinyint, tuple, uuid, varint
242400
updates are detected for TYPE_FORWARD_ONLY result sets false
243401
updates are detected for TYPE_SCROLL_INSENSITIVE result sets false
244402
updates are detected for TYPE_SCROLL_SENSITIVE result sets false
@@ -248,9 +406,9 @@ uses local files false
248406

249407
JDBC Driver Information
250408
-=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=-
251-
connection url jdbc:cassandra://localhost:54891/store
409+
connection url jdbc:cassandra://localhost:64292/books
252410
driver name Cassandra JDBC Driver
253-
driver version 4.4.0
411+
driver version 4.10.2
254412
driver class name com.ing.data.cassandra.jdbc.CassandraDriver
255413
is JDBC compliant false
256414
supported JDBC version 4.0

0 commit comments

Comments
 (0)