Skip to content

Fix PG 18 pg_query_parse_plpgsql() regressions + add regression samples #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pyramation wants to merge 1 commit into
base: 18-latest
Choose a base branch
from
Open

Fix PG 18 pg_query_parse_plpgsql() regressions + add regression samples #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions scripts/mocks/LookupExplicitNamespace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@ LookupExplicitNamespace(const char *nspname, bool missing_ok)
*/
}

// CHANGED: Only support pg_catalog and public namespace
// CHANGED: We don't have a real catalog to look namespaces up in. Resolve
// pg_catalog to its well-known OID, and treat every other schema (public or
// any user schema like "my_schema") as the public namespace so that
// schema-qualified variable types resolve to the RECORDOID path instead of
// erroring out. The original schema name is preserved in the PL/pgSQL type
// string regardless.
if (strcmp(nspname, "pg_catalog") == 0)
return PG_CATALOG_NAMESPACE;

if (strcmp(nspname, "public") == 0)
return PG_PUBLIC_NAMESPACE;

elog(ERROR, "Not implemented (LookupExplicitNamespace only supports pg_catalog and public)");
return PG_PUBLIC_NAMESPACE;

/*namespaceId = get_namespace_oid(nspname, missing_ok);
if (missing_ok && !OidIsValid(namespaceId))
Expand Down
9 changes: 7 additions & 2 deletions src/pg_query_json_plpgsql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,9 @@ dump_return(StringInfo out, PLpgSQL_stmt_return *node)

WRITE_INT_FIELD(lineno, lineno, lineno);
WRITE_EXPR_FIELD(expr);
//WRITE_INT_FIELD(retvarno);
/* retvarno is -1 when an expression is returned; only emit real datums */
if (node->retvarno >= 0)
appendStringInfo(out, "\"retvarno\":%d,", node->retvarno);
}

static void
Expand All @@ -516,7 +518,9 @@ dump_return_next(StringInfo out, PLpgSQL_stmt_return_next *node)

WRITE_INT_FIELD(lineno, lineno, lineno);
WRITE_EXPR_FIELD(expr);
//WRITE_INT_FIELD(retvarno);
/* retvarno is -1 when an expression is returned; only emit real datums */
if (node->retvarno >= 0)
appendStringInfo(out, "\"retvarno\":%d,", node->retvarno);
}

static void
Expand Down Expand Up @@ -649,6 +653,7 @@ dump_function(StringInfo out, PLpgSQL_function *node)
switch (d->dtype)
{
case PLPGSQL_DTYPE_VAR:
case PLPGSQL_DTYPE_PROMISE:
dump_var(out, (PLpgSQL_var *) d);
break;
case PLPGSQL_DTYPE_ROW:
Expand Down
12 changes: 7 additions & 5 deletions src/postgres/src_backend_catalog_namespace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,14 +952,16 @@ LookupExplicitNamespace(const char *nspname, bool missing_ok)
*/
}

// CHANGED: Only support pg_catalog and public namespace
// CHANGED: We don't have a real catalog to look namespaces up in. Resolve
// pg_catalog to its well-known OID, and treat every other schema (public or
// any user schema like "my_schema") as the public namespace so that
// schema-qualified variable types resolve to the RECORDOID path instead of
// erroring out. The original schema name is preserved in the PL/pgSQL type
// string regardless.
if (strcmp(nspname, "pg_catalog") == 0)
return PG_CATALOG_NAMESPACE;

if (strcmp(nspname, "public") == 0)
return PG_PUBLIC_NAMESPACE;

elog(ERROR, "Not implemented (LookupExplicitNamespace only supports pg_catalog and public)");
return PG_PUBLIC_NAMESPACE;

/*namespaceId = get_namespace_oid(nspname, missing_ok);
if (missing_ok && !OidIsValid(namespaceId))
Expand Down
Loading
Loading