adjust sqllogic tests to avoid builtin comments

Signed-off-by: Petros Angelatos <petrosagg@gmail.com>

Author: petrosagg

test/sqllogictest/alter-table.slt

@@ -439,5 +439,5 @@ statement ok
 DROP TABLE t2 CASCADE;
 
 query TTIT
-SELECT * FROM mz_internal.mz_comments;
+SELECT * FROM mz_internal.mz_comments WHERE id = 'u1';
 ----

test/sqllogictest/comment.slt

@@ -29,12 +29,12 @@ statement ok
 COMMENT ON TABLE a IS 'foo_table';
 
 query TTT
-SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments;
+SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments WHERE id NOT LIKE 's%';
 ----
 table  NULL  foo_table
 
 query IT
-SELECT objsubid, description FROM pg_description;
+SELECT objsubid, description FROM pg_description WHERE objoid >= 20000;
 ----
 0  foo_table
 
@@ -53,13 +53,13 @@ statement ok
 COMMENT ON COLUMN a.y IS 'load_bearing';
 
 query TTT
-SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments;
+SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments WHERE id NOT LIKE 's%';
 ----
 table  NULL  foo_table
 table  2  load_bearing
 
 query IT
-SELECT objsubid, description FROM pg_description;
+SELECT objsubid, description FROM pg_description WHERE objoid >= 20000;
 ----
 0  foo_table
 2  load_bearing
@@ -93,14 +93,14 @@ statement ok
 COMMENT ON COLUMN b.ts IS 'utc_timestamp';
 
 query TTT
-SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments;
+SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments WHERE id NOT LIKE 's%';
 ----
 table  NULL  foo_table
 table  2  load_bearing
 table  1  utc_timestamp
 
 query IT
-SELECT objsubid, description FROM pg_description;
+SELECT objsubid, description FROM pg_description WHERE objoid >= 20000;
 ----
 0  foo_table
 2  load_bearing
@@ -119,13 +119,13 @@ statement ok
 DROP TABLE a;
 
 query TTT
-SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments;
+SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments WHERE id NOT LIKE 's%';
 ----
 table  NULL foo_table
 table  1  utc_timestamp
 
 query IT
-SELECT objsubid, description FROM pg_description;
+SELECT objsubid, description FROM pg_description WHERE objoid >= 20000;
 ----
 0  foo_table
 1  utc_timestamp
@@ -142,11 +142,11 @@ statement ok
 COMMENT ON COLUMN b.ts IS NULL
 
 query TTT
-SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments;
+SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments WHERE id NOT LIKE 's%';
 ----
 
 query IT
-SELECT objsubid, description FROM pg_description;
+SELECT objsubid, description FROM pg_description WHERE objoid >= 20000;
 ----
 
 statement error unknown catalog item 'c'
@@ -173,13 +173,13 @@ statement ok
 COMMENT ON VIEW c IS 'this_is_a_view';
 
 query TTT
-SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments;
+SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments WHERE id NOT LIKE 's%';
 ----
 index NULL  speed_up
 view  NULL  this_is_a_view
 
 query IT
-SELECT objsubid, description FROM pg_description;
+SELECT objsubid, description FROM pg_description WHERE objoid >= 20000;
 ----
 0  speed_up
 0  this_is_a_view
@@ -207,13 +207,13 @@ col_2 (empty)
 col_1 this_works
 
 query TTT
-SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments;
+SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments WHERE id NOT LIKE 's%';
 ----
 view  1  this_works
 view  NULL  this_is_a_view
 
 query IT
-SELECT objsubid, description FROM pg_description;
+SELECT objsubid, description FROM pg_description WHERE objoid >= 20000;
 ----
 1  this_works
 0  this_is_a_view
@@ -238,15 +238,15 @@ SELECT name, comment FROM (SHOW COLUMNS FROM mv);
 x comment_mat_view_col
 
 query TTT
-SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments;
+SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments WHERE id NOT LIKE 's%';
 ----
 view  1  this_works
 view  NULL  this_is_a_view
 materialized-view  NULL  mat_foo
 materialized-view  1  comment_mat_view_col
 
 query IT
-SELECT objsubid, description FROM pg_description;
+SELECT objsubid, description FROM pg_description WHERE objoid >= 20000;
 ----
 0  mat_foo
 1  this_works
@@ -285,11 +285,11 @@ statement ok
 DROP MATERIALIZED VIEW mv;
 
 query TTT
-SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments;
+SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments WHERE id NOT LIKE 's%';
 ----
 
 query IT
-SELECT objsubid, description FROM pg_description;
+SELECT objsubid, description FROM pg_description WHERE objoid >= 20000;
 ----
 
 statement ok
@@ -313,13 +313,13 @@ statement ok
 COMMENT ON CLUSTER REPLICA comment_cluster.r2 IS 'second_replicator';
 
 query TTT
-SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments;
+SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments WHERE id NOT LIKE 's%';
 ----
 cluster NULL careful_now
 cluster-replica NULL second_replicator
 
 query IT
-SELECT objsubid, description FROM pg_description;
+SELECT objsubid, description FROM pg_description WHERE objoid >= 20000;
 ----
 
 statement ok
@@ -335,7 +335,7 @@ statement ok
 COMMENT ON COLUMN my_webhook.body IS 'json_blob';
 
 query TTT
-SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments;
+SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments WHERE id NOT LIKE 's%';
 ----
 source  1  json_blob
 source  NULL  all_the_data
@@ -348,7 +348,7 @@ SELECT obj_description((SELECT oid FROM mz_sources WHERE name = 'my_webhook'), '
 all_the_data  json_blob
 
 query IT
-SELECT objsubid, description FROM pg_description;
+SELECT objsubid, description FROM pg_description WHERE objoid >= 20000;
 ----
 1  json_blob
 0  all_the_data
@@ -404,7 +404,7 @@ statement ok
 COMMENT ON TYPE custom_type IS 'custom_type_comment';
 
 query TTT
-SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments;
+SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments WHERE id NOT LIKE 's%';
 ----
 source   1      json_blob
 type     NULL   supercool_list
@@ -436,7 +436,7 @@ statement ok
 COMMENT ON COLUMN custom_type.y IS 'custom_type_y_comment';
 
 query TTT
-SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments;
+SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments WHERE id NOT LIKE 's%';
 ----
 source   1      json_blob
 type     NULL   supercool_list
@@ -447,7 +447,7 @@ type     1      custom_type_x_comment
 type     2      custom_type_y_comment
 
 query IT
-SELECT objsubid, description FROM pg_description;
+SELECT objsubid, description FROM pg_description WHERE objoid >= 20000;
 ----
 1 json_blob
 0 all_the_data
@@ -479,7 +479,7 @@ statement ok
 COMMENT ON SECRET my_secret IS 'supersecret';
 
 query TTT
-SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments;
+SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments WHERE id NOT LIKE 's%';
 ----
 secret NULL supersecret
 type NULL supercool_list
@@ -488,7 +488,7 @@ type     1      custom_type_x_comment
 type     2      custom_type_y_comment
 
 query IT
-SELECT objsubid, description FROM pg_description;
+SELECT objsubid, description FROM pg_description WHERE objoid >= 20000;
 ----
 0  supercool_list
 0 custom_type_comment
@@ -529,13 +529,13 @@ statement ok
 DROP TYPE int4_list;
 
 query TTT
-SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments;
+SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments WHERE id NOT LIKE 's%';
 ----
 database NULL this_is_my_db
 schema NULL this_is_my_schema
 
 query IT
-SELECT objsubid, description FROM pg_description;
+SELECT objsubid, description FROM pg_description WHERE objoid >= 20000;
 ----
 0  this_is_my_schema
 
@@ -562,12 +562,12 @@ statement ok
 COMMENT ON ROLE student IS 'limited_role';
 
 query TTT
-SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments;
+SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments WHERE id NOT LIKE 's%';
 ----
 role NULL limited_role
 
 query IT
-SELECT objsubid, description FROM pg_description;
+SELECT objsubid, description FROM pg_description WHERE objoid >= 20000;
 ----
 
 statement ok
@@ -592,13 +592,13 @@ COMMENT ON ROLE teacher IS 'foo';
 COMPLETE 0
 
 query TTT
-SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments;
+SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments WHERE id NOT LIKE 's%';
 ----
 role NULL foo
 role NULL limited_role
 
 query IT
-SELECT objsubid, description FROM pg_description;
+SELECT objsubid, description FROM pg_description WHERE objoid >= 20000;
 ----
 
 simple conn=mz_system,user=mz_system
@@ -620,11 +620,11 @@ statement ok
 DROP ROLE teacher;
 
 query TTT
-SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments;
+SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments WHERE id NOT LIKE 's%';
 ----
 
 query IT
-SELECT objsubid, description FROM pg_description;
+SELECT objsubid, description FROM pg_description WHERE objoid >= 20000;
 ----
 
 statement error must be owner of DATABASE materialize
@@ -639,10 +639,10 @@ COMMENT ON DATABASE materialize IS 'main_db';
 COMPLETE 0
 
 query TTT
-SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments;
+SELECT object_type, object_sub_id, comment FROM mz_internal.mz_comments WHERE id NOT LIKE 's%';
 ----
 database  NULL  main_db
 
 query IT
-SELECT objsubid, description FROM pg_description;
+SELECT objsubid, description FROM pg_description WHERE objoid >= 20000;
 ----