Skip to content

Commit 07ac467

Browse files
committed
Ignore new parse_catalog_privileges function, update issue links
1 parent 86c3d49 commit 07ac467

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

expr.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ const_expr::const_expr(prod *p, sqltype *type_constraint)
207207
// Error: ERROR: column "default" does not exist
208208
//else if (dynamic_cast<insert_stmt*>(p) && (d6() > 3))
209209
// expr += "default";
210-
// https://github.com/MaterializeInc/materialize/issues/17870
210+
// https://github.com/MaterializeInc/database-issues/issues/5211
211211
else if (type->name == "any")
212212
expr = "null";
213213
else if (type->name == "anycompatible")
@@ -432,7 +432,7 @@ void funcall::out(std::ostream &out)
432432
out << proc->ident() << "(";
433433
for (auto expr = parms.begin(); expr != parms.end(); expr++) {
434434
indent(out);
435-
// https://github.com/MaterializeInc/materialize/issues/17870
435+
// https://github.com/MaterializeInc/database-issues/issues/5211
436436
if ((*expr)->type->name.rfind("list", 0) != 0 && (*expr)->type->name.rfind("map", 0) != 0 && (*expr)->type->name.rfind("record", 0) != 0 && (*expr)->type->name.rfind("any", 0) != 0)
437437
out << "CAST(" << **expr << " as " << (*expr)->type->name << ")";
438438
else

postgres.cc

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ schema_pqxx::schema_pqxx(std::string &conninfo, bool no_catalog, bool dump_state
213213
"FROM mz_catalog.mz_relations r "
214214
"JOIN mz_catalog.mz_schemas s ON s.id = r.schema_id "
215215
"LEFT JOIN mz_catalog.mz_databases d ON d.id = s.database_id "
216-
"where r.name not like 'mz_dataflow_operator_reachability%' " // https://github.com/MaterializeInc/materialize/issues/18296
216+
"where r.name not like 'mz_dataflow_operator_reachability%' " // https://github.com/MaterializeInc/database-issues/issues/5387
217217
"and r.name not like '%_raw' " // Can be huge, easy to go OoM
218218
);
219219
if (dump_state) {
@@ -270,7 +270,7 @@ schema_pqxx::schema_pqxx(std::string &conninfo, bool no_catalog, bool dump_state
270270
"from pg_attribute join pg_class c on( c.oid = attrelid ) "
271271
"join pg_namespace n on n.oid = relnamespace "
272272
"where not attisdropped "
273-
"and not (nspname in ('mz_catalog', 'pg_catalog', 'mz_internal', 'information_schema', 'mz_introspection') and atttypid = 18) " // Expected, see https://github.com/MaterializeInc/materialize/issues/17899
273+
"and not (nspname in ('mz_catalog', 'pg_catalog', 'mz_internal', 'information_schema', 'mz_introspection') and atttypid = 18) " // Expected, see https://github.com/MaterializeInc/database-issues/issues/5222
274274
"and attname not in "
275275
"('xmin', 'xmax', 'ctid', 'cmin', 'cmax', 'tableoid', 'oid') ");
276276
q += " and relname = " + w.quote(t->name);
@@ -398,7 +398,7 @@ schema_pqxx::schema_pqxx(std::string &conninfo, bool no_catalog, bool dump_state
398398
"AND mz_functions.name <> 'mz_panic' " // don't want crashes
399399
"AND mz_functions.name <> 'mz_error_if_null' " // don't want errors with random messages
400400
"AND mz_functions.name <> 'mz_logical_timestamp' " // mz_logical_timestamp() has been renamed to mz_now()
401-
"AND mz_functions.name <> 'mz_sleep' " // https://github.com/MaterializeInc/materialize/issues/17984
401+
"AND mz_functions.name <> 'mz_sleep' " // https://github.com/MaterializeInc/database-issues/issues/5256
402402
"AND mz_functions.name <> 'date_bin' " // binary date_bin is unsupported
403403
"AND mz_functions.name <> 'list_length_max' " // list_length_max is unsupported
404404
"AND mz_functions.name <> 'list_n_layers' " // list_n_layers is unsupported
@@ -413,12 +413,13 @@ schema_pqxx::schema_pqxx(std::string &conninfo, bool no_catalog, bool dump_state
413413
"AND mz_functions.name <> 'mz_global_id_to_name' " // common "does not exist" errors
414414
"AND mz_functions.name <> 'date_bin_hopping' " // the date_bin_hopping function is not supported
415415
"AND mz_functions.name <> 'generate_series' " // out of memory on large data sets
416-
"AND NOT mz_functions.name like '%recv' " // https://github.com/MaterializeInc/materialize/issues/17870
416+
"AND NOT mz_functions.name like '%recv' " // https://github.com/MaterializeInc/database-issues/issues/5211
417417
"AND mz_functions.name <> 'pg_cancel_backend' " // pg_cancel_backend in this position not yet supported
418-
"AND (mz_functions.name <> 'sum' OR mz_functions.return_type_id <> (select id from mz_types where name = 'interval'))" // sum(interval) not yet supported, see https://github.com/MaterializeInc/materialize/issues/18043
418+
"AND (mz_functions.name <> 'sum' OR mz_functions.return_type_id <> (select id from mz_types where name = 'interval'))" // sum(interval) not yet supported, see https://github.com/MaterializeInc/database-issues/issues/5285
419419
"AND (mz_functions.name <> 'timezone' OR mz_functions.argument_type_ids[2] <> (select id from mz_types where name = 'time'))" // timezone with time type is intentionally not supported, see https://github.com/MaterializeInc/materialize/pull/22960
420420
"AND mz_functions.name <> 'pretty_sql' " // Expected a keyword at the beginning of a statement, found ...
421421
"AND mz_functions.name <> 'map_build' " // map_build(text list) does not exist
422+
"AND mz_functions.name <> 'parse_catalog_privileges' " // TODO: Reenable when fixed https://github.com/MaterializeInc/database-issues/issues/11261
422423
"AND NOT (" + procedure_is_aggregate + " or " + procedure_is_window + ") ");
423424

424425
if (dump_state) {
@@ -455,7 +456,7 @@ schema_pqxx::schema_pqxx(std::string &conninfo, bool no_catalog, bool dump_state
455456
proc.argtypes.push_back(oid2type[obj.get<OID>()]);
456457
}
457458
} else {
458-
// unnest is broken: https://github.com/MaterializeInc/materialize/issues/17979
459+
// unnest is broken, see https://github.com/MaterializeInc/database-issues/issues/5252
459460
//string q("select (select oid from mz_types where a = id) from mz_functions, lateral unnest(argument_type_ids) as a where oid = ");
460461
string q("select array_to_string(argument_type_ids, ',') from mz_functions where oid = ");
461462
q += w.quote(proc.specific_name);
@@ -519,8 +520,8 @@ schema_pqxx::schema_pqxx(std::string &conninfo, bool no_catalog, bool dump_state
519520
"ON mz_functions.return_type_id = ret_type.id "
520521
"WHERE mz_functions.name not in ('pg_event_trigger_table_rewrite_reason', 'percentile_cont', 'dense_rank', 'cume_dist', 'rank', 'test_rank', 'percent_rank', 'percentile_disc', 'mode', 'test_percentile_disc') "
521522
"AND mz_functions.name !~ '^ri_fkey_' "
522-
"AND NOT (mz_functions.name in ('sum', 'avg', 'avg_internal_v1') AND ret_type.oid = 1186) " // https://github.com/MaterializeInc/materialize/issues/18043
523-
"AND mz_functions.name <> 'array_agg' " // https://github.com/MaterializeInc/materialize/issues/18044
523+
"AND NOT (mz_functions.name in ('sum', 'avg', 'avg_internal_v1') AND ret_type.oid = 1186) " // https://github.com/MaterializeInc/database-issues/issues/5285
524+
"AND mz_functions.name <> 'array_agg' " // https://github.com/MaterializeInc/database-issues/issues/5286
524525
"AND NOT (mz_functions.name = 'string_agg' AND ret_type.oid = 17) " // string_agg on BYTEA not yet supported
525526
"AND NOT (mz_functions.name in ('mz_any', 'mz_all')) " // https://github.com/MaterializeInc/database-issues/issues/9298
526527
"AND " + procedure_is_aggregate + " AND NOT " + procedure_is_window);
@@ -550,7 +551,7 @@ schema_pqxx::schema_pqxx(std::string &conninfo, bool no_catalog, bool dump_state
550551

551552
int aggregate_index = 0;
552553
for (auto &proc : aggregates) {
553-
// unnest is broken: https://github.com/MaterializeInc/materialize/issues/17979
554+
// unnest is broken, see https://github.com/MaterializeInc/database-issues/issues/5252
554555
//string q("select (select oid from mz_types where a = id) from mz_functions, lateral unnest(argument_type_ids) as a where oid = ");
555556
if (read_state) {
556557
for (const auto &obj : data["aggregates"][aggregate_index]["parameters"]) {

0 commit comments

Comments
 (0)