Skip to content

Commit 6ebb194

Browse files
committed
Version guards in SHOW CREATE tests
1 parent bf9abe7 commit 6ebb194

File tree

5 files changed

+32
-11
lines changed

5 files changed

+32
-11
lines changed

misc/python/materialize/checks/all_checks/webhook.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,11 @@ def validate(self) -> Testdrive:
164164
anotha_one!
165165
threeeeeee
166166
167-
> SHOW CREATE TABLE webhook_table_text
167+
>[version>=13900] SHOW CREATE TABLE webhook_table_text
168168
materialize.public.webhook_table_text "CREATE TABLE materialize.public.webhook_table_text FROM WEBHOOK BODY FORMAT TEXT;"
169+
170+
>[version<13900] SHOW CREATE TABLE webhook_table_text
171+
materialize.public.webhook_table_text "CREATE TABLE \"materialize\".\"public\".\"webhook_table_text\" FROM WEBHOOK BODY FORMAT TEXT"
169172
"""
170173
)
171174
)

test/mysql-cdc-old-syntax/10-create-connection.td

+6-1
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,16 @@ name type
4141
------------------------------
4242
mysq mysql
4343

44-
> SHOW CREATE CONNECTION mysq
44+
?[version>=13900] SHOW CREATE CONNECTION mysq
4545
name create_sql
4646
---------------------------------
4747
materialize.public.mysq "CREATE CONNECTION materialize.public.mysq TO MYSQL (HOST = mysql, PASSWORD = SECRET materialize.public.mysqlpass, USER = root);"
4848

49+
>[version<13900] SHOW CREATE CONNECTION mysq
50+
name create_sql
51+
---------------------------------
52+
materialize.public.mysq "CREATE CONNECTION \"materialize\".\"public\".\"mysq\" TO MYSQL (HOST = \"mysql\", PASSWORD = SECRET \"materialize\".\"public\".\"mysqlpass\", USER = \"root\")"
53+
4954
#
5055
# Error checking
5156
#

test/mysql-cdc-old-syntax/alter-source.td

-4
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,6 @@ contains:cannot drop source "table_e": still depended upon by materialized view
204204
mz_source_progress progress
205205
table_g subsource
206206

207-
# Show that all table definitions have been updated
208-
> SELECT regexp_match(create_sql, 'FOR TABLES \((.+?)\) EXPOSE') FROM (SHOW CREATE SOURCE mz_source);
209-
"{\"public\".\"table_g\" AS \"materialize\".\"public\".\"table_g\"}"
210-
211207
> SHOW MATERIALIZED VIEWS
212208

213209
> DROP SOURCE table_g;

test/mysql-cdc/10-create-connection.td

+6-1
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,16 @@ name type
4141
------------------------------
4242
mysq mysql
4343

44-
> SHOW CREATE CONNECTION mysq
44+
>[version>=13900] SHOW CREATE CONNECTION mysq
4545
name create_sql
4646
---------------------------------
4747
materialize.public.mysq "CREATE CONNECTION materialize.public.mysq TO MYSQL (HOST = mysql, PASSWORD = SECRET materialize.public.mysqlpass, USER = root);"
4848

49+
>[version<13900] SHOW CREATE CONNECTION mysq
50+
name create_sql
51+
---------------------------------
52+
materialize.public.mysq "CREATE CONNECTION \"materialize\".\"public\".\"mysq\" TO MYSQL (HOST = \"mysql\", PASSWORD = SECRET \"materialize\".\"public\".\"mysqlpass\", USER = \"root\")"
53+
4954
#
5055
# Error checking
5156
#

test/pg-cdc-old-syntax/alter-source.td

+16-4
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,18 @@ table_e subsource
129129
table_f subsource
130130
table_g subsource
131131

132-
> SELECT regexp_match(create_sql, 'TEXT COLUMNS = \((.*?)\)')[1] FROM (SHOW CREATE SOURCE mz_source);
132+
?[version>=13900] SELECT regexp_match(create_sql, 'TEXT COLUMNS = \((.*?)\)')[1] FROM (SHOW CREATE SOURCE mz_source);
133133
postgres.public.table_f.f2
134134

135-
> SELECT regexp_match(create_sql, 'TEXT COLUMNS = \((.*?)\)')[1] FROM (SHOW CREATE SOURCE table_f);
135+
>[version<13900] SELECT regexp_match(create_sql, 'TEXT COLUMNS = \((.*?)\)')[1] FROM (SHOW CREATE SOURCE mz_source);
136+
"\"postgres\".\"public\".\"table_f\".\"f2\""
137+
138+
?[version>=13900] SELECT regexp_match(create_sql, 'TEXT COLUMNS = \((.*?)\)')[1] FROM (SHOW CREATE SOURCE table_f);
136139
f2
137140

141+
>[version<13900] SELECT regexp_match(create_sql, 'TEXT COLUMNS = \((.*?)\)')[1] FROM (SHOW CREATE SOURCE table_f);
142+
"\"f2\""
143+
138144
#
139145
# State checking
140146
#
@@ -338,7 +344,10 @@ contains: invalid TEXT COLUMNS option value: unexpected multiple references to p
338344
1 var0
339345
2 var1
340346

341-
> SELECT regexp_match(create_sql, 'TEXT COLUMNS = \((.*?)\)')[1] FROM (SHOW CREATE SOURCE mz_source);
347+
?[version>=13900] SELECT regexp_match(create_sql, 'TEXT COLUMNS = \((.*?)\)')[1] FROM (SHOW CREATE SOURCE mz_source);
348+
postgres.public.table_f.f2
349+
350+
>[version<13900] SELECT regexp_match(create_sql, 'TEXT COLUMNS = \((.*?)\)')[1] FROM (SHOW CREATE SOURCE mz_source);
342351
"\"postgres\".\"public\".\"table_f\".\"f2\""
343352

344353
# Drop a table that's in the publication, which shuffles the tables' output
@@ -355,7 +364,10 @@ INSERT INTO table_f VALUES (3, 'var1');
355364

356365
> ALTER SOURCE mz_source ADD SUBSOURCE table_i WITH (TEXT COLUMNS [table_i.f2]);
357366

358-
> SELECT regexp_match(create_sql, 'TEXT COLUMNS = \((.*?)\)')[1] FROM (SHOW CREATE SOURCE mz_source);
367+
?[version>=13900] SELECT regexp_match(create_sql, 'TEXT COLUMNS = \((.*?)\)')[1] FROM (SHOW CREATE SOURCE mz_source);
368+
postgres.public.table_f.f2, postgres.public.table_i.f2
369+
370+
>[version<13900] SELECT regexp_match(create_sql, 'TEXT COLUMNS = \((.*?)\)')[1] FROM (SHOW CREATE SOURCE mz_source);
359371
"\"postgres\".\"public\".\"table_f\".\"f2\", \"postgres\".\"public\".\"table_i\".\"f2\""
360372

361373
> SELECT regexp_match(create_sql, 'TEXT COLUMNS = \((.*?)\)')[1] FROM (SHOW CREATE SOURCE table_i);

0 commit comments

Comments
 (0)