Skip to content

Fix issue with too long schema names breaking MotherDuck sync #680

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

Merged
JelteF merged 3 commits into from
Mar 20, 2025
Merged

Fix issue with too long schema names breaking MotherDuck sync #680

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b39361
Fix issue with too long schema names breaking MotherDuck sync
JelteF Mar 20, 2025
e531172
Update src/pgduckdb_background_worker.cpp
JelteF Mar 20, 2025
2382172
Update src/pgduckdb_background_worker.cpp
JelteF Mar 20, 2025
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
22 changes: 18 additions & 4 deletions src/pgduckdb_background_worker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,6 +734,14 @@ GrantAccessToSchema(const char *postgres_schema_name) {

static bool
CreateSchemaIfNotExists(const char *postgres_schema_name, bool is_default_db) {
/* -1 is for the NULL terminator */
if (strlen(postgres_schema_name) > NAMEDATALEN - 1) {
ereport(WARNING,
(errmsg("Skipping sync of MotherDuck schema '%s' because its name is too long", postgres_schema_name),
errhint("The maximum length of a schema name is %d characters", NAMEDATALEN - 1)));
return false;
}

Oid schema_oid = get_namespace_oid(postgres_schema_name, true);
if (schema_oid != InvalidOid) {
/*
Expand Down Expand Up @@ -803,15 +811,18 @@ CreateSchemaIfNotExists(const char *postgres_schema_name, bool is_default_db) {
return false;
}

/* Success, so we commit the subtransaction */
ReleaseCurrentSubTransaction();

if (!is_default_db) {
/*
* For ddb$ schemas we need to record a dependency between the schema
* and the extension, so that DROP EXTENSION also drops these schemas.
*/
schema_oid = get_namespace_oid(postgres_schema_name, false);
schema_oid = get_namespace_oid(postgres_schema_name, true);
if (schema_oid == InvalidOid) {
elog(WARNING, "Failed to create schema '%s' for unknown reason, skipping sync", postgres_schema_name);
RollbackAndReleaseCurrentSubTransaction();
return false;
}

ObjectAddress schema_address = {
.classId = NamespaceRelationId,
.objectId = schema_oid,
Expand All @@ -825,6 +836,9 @@ CreateSchemaIfNotExists(const char *postgres_schema_name, bool is_default_db) {
recordDependencyOn(&schema_address, &extension_address, DEPENDENCY_NORMAL);
}

/* Success, so we commit the subtransaction */
ReleaseCurrentSubTransaction();

/* And then we also commit the actual transaction to release any locks that
* were necessary to execute it. */
SPI_commit_that_works_in_bgworker();
Expand Down