Skip to content

Commit a114777

Browse files
ggevayggevay
committed
Version guards in SHOW CREATE tests
1 parent bf9abe7 commit a114777

File tree

7 files changed

+56
-17
lines changed

7 files changed

+56
-17
lines changed

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,23 @@ def validate(self) -> Testdrive:
110110
\\\\x01
111111
\\\\x01\\x02\\x03\\x04
112112
113-
> SHOW CREATE SOURCE webhook_text
113+
>[version>=13900] SHOW CREATE SOURCE webhook_text
114114
materialize.public.webhook_text "CREATE SOURCE materialize.public.webhook_text IN CLUSTER webhook_cluster FROM WEBHOOK BODY FORMAT TEXT;"
115115
116-
> SHOW CREATE SOURCE webhook_json
116+
>[version>=13900] SHOW CREATE SOURCE webhook_json
117117
materialize.public.webhook_json "CREATE SOURCE materialize.public.webhook_json IN CLUSTER webhook_cluster FROM WEBHOOK BODY FORMAT JSON INCLUDE HEADERS;"
118118
119-
> SHOW CREATE SOURCE webhook_bytes
119+
>[version>=13900] SHOW CREATE SOURCE webhook_bytes
120120
materialize.public.webhook_bytes "CREATE SOURCE materialize.public.webhook_bytes IN CLUSTER webhook_cluster FROM WEBHOOK BODY FORMAT BYTES;"
121+
122+
>[version<13900] SHOW CREATE SOURCE webhook_text
123+
materialize.public.webhook_text "CREATE SOURCE \\"materialize\\".\\"public\\".\\"webhook_text\\" IN CLUSTER \\"webhook_cluster\\" FROM WEBHOOK BODY FORMAT TEXT"
124+
125+
>[version<13900] SHOW CREATE SOURCE webhook_json
126+
materialize.public.webhook_json "CREATE SOURCE \\"materialize\\".\\"public\\".\\"webhook_json\\" IN CLUSTER \\"webhook_cluster\\" FROM WEBHOOK BODY FORMAT JSON INCLUDE HEADERS"
127+
128+
>[version<13900] SHOW CREATE SOURCE webhook_bytes
129+
materialize.public.webhook_bytes "CREATE SOURCE \\"materialize\\".\\"public\\".\\"webhook_bytes\\" IN CLUSTER \\"webhook_cluster\\" FROM WEBHOOK BODY FORMAT BYTES"
121130
"""
122131
)
123132
)
@@ -164,8 +173,11 @@ def validate(self) -> Testdrive:
164173
anotha_one!
165174
threeeeeee
166175
167-
> SHOW CREATE TABLE webhook_table_text
176+
>[version>=13900] SHOW CREATE TABLE webhook_table_text
168177
materialize.public.webhook_table_text "CREATE TABLE materialize.public.webhook_table_text FROM WEBHOOK BODY FORMAT TEXT;"
178+
179+
>[version<13900] SHOW CREATE TABLE webhook_table_text
180+
materialize.public.webhook_table_text "CREATE TABLE \"materialize\".\"public\".\"webhook_table_text\" FROM WEBHOOK BODY FORMAT TEXT"
169181
"""
170182
)
171183
)

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

Lines changed: 6 additions & 1 deletion
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/30-text-columns.td‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,12 @@ INSERT INTO t1 SELECT * FROM t1;
8888
"0000-00-00 00:00:00.0000"
8989
"0000-00-00 00:00:00.0000"
9090

91-
> SHOW CREATE SOURCE t1;
91+
>[version>=13900] SHOW CREATE SOURCE t1;
9292
materialize.public.t1 "CREATE SUBSOURCE materialize.public.t1 (f1 pg_catalog.text, f2 pg_catalog.text, f3 pg_catalog.text, f4 pg_catalog.text, f5 pg_catalog.text, f6 pg_catalog.text, f7 pg_catalog.text, f8 pg_catalog.text, f9 pg_catalog.text) OF SOURCE materialize.public.da WITH (EXTERNAL REFERENCE = public.t1, TEXT COLUMNS = (f1, f2, f3, f4, f5, f6, f7, f8, f9));"
9393

94+
>[version<13900] SHOW CREATE SOURCE t1;
95+
materialize.public.t1 "CREATE SUBSOURCE \"materialize\".\"public\".\"t1\" (\"f1\" \"pg_catalog\".\"text\", \"f2\" \"pg_catalog\".\"text\", \"f3\" \"pg_catalog\".\"text\", \"f4\" \"pg_catalog\".\"text\", \"f5\" \"pg_catalog\".\"text\", \"f6\" \"pg_catalog\".\"text\", \"f7\" \"pg_catalog\".\"text\", \"f8\" \"pg_catalog\".\"text\", \"f9\" \"pg_catalog\".\"text\") OF SOURCE \"materialize\".\"public\".\"da\" WITH (EXTERNAL REFERENCE = \"public\".\"t1\", TEXT COLUMNS = (\"f1\", \"f2\", \"f3\", \"f4\", \"f5\", \"f6\", \"f7\", \"f8\", \"f9\"))"
96+
9497
> DROP SOURCE da CASCADE;
9598

9699
#

‎test/mysql-cdc-old-syntax/35-exclude-columns.td‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,12 @@ INSERT INTO t1 SELECT * FROM t1;
6161
"test"
6262
"test"
6363

64-
> SHOW CREATE SOURCE t1;
64+
>[version>=13900] SHOW CREATE SOURCE t1;
6565
materialize.public.t1 "CREATE SUBSOURCE materialize.public.t1 (f1 pg_catalog.int4, f4 pg_catalog.varchar(64)) OF SOURCE materialize.public.da WITH (EXTERNAL REFERENCE = public.t1, EXCLUDE COLUMNS = (f2, f3));"
6666

67+
>[version<13900] SHOW CREATE SOURCE t1;
68+
materialize.public.t1 "CREATE SUBSOURCE \"materialize\".\"public\".\"t1\" (\"f1\" \"pg_catalog\".\"int4\", \"f4\" \"pg_catalog\".\"varchar\"(64)) OF SOURCE \"materialize\".\"public\".\"da\" WITH (EXTERNAL REFERENCE = \"public\".\"t1\", EXCLUDE COLUMNS = (\"f2\", \"f3\"))"
69+
6770
! SELECT f2 FROM t1;
6871
contains:column "f2" does not exist
6972

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

Lines changed: 0 additions & 4 deletions
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‎

Lines changed: 6 additions & 1 deletion
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‎

Lines changed: 20 additions & 5 deletions
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,12 +364,18 @@ 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

361-
> SELECT regexp_match(create_sql, 'TEXT COLUMNS = \((.*?)\)')[1] FROM (SHOW CREATE SOURCE table_i);
373+
>[version>=13900] SELECT regexp_match(create_sql, 'TEXT COLUMNS = \((.*?)\)')[1] FROM (SHOW CREATE SOURCE table_i);
362374
f2
363375

376+
>[version<13900] SELECT regexp_match(create_sql, 'TEXT COLUMNS = \((.*?)\)')[1] FROM (SHOW CREATE SOURCE table_i);
377+
"\"f2\""
378+
364379
> SELECT * FROM table_f
365380
1 var0
366381
2 var1

0 commit comments

Comments
 (0)