Skip to content

fix(nocodb): Add postgres data source w/o CREATE ON DATABASE permission #5399

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
merged 2 commits into from
Apr 4, 2023
Merged

fix(nocodb): Add postgres data source w/o CREATE ON DATABASE permission #5399

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d371d6
Add a schemaExists check
data-envoy Apr 1, 2023
3fb2c51
Update PgClient.ts
data-envoy Apr 1, 2023
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
27 changes: 16 additions & 11 deletions packages/nocodb/src/lib/db/sql-client/lib/pg/PgClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,17 +474,22 @@ class PGClient extends KnexClient {
]);
}

// if (this.connectionConfig.searchPath && this.connectionConfig.searchPath[0]) {
await this.sqlClient.raw(
` CREATE SCHEMA IF NOT EXISTS ?? AUTHORIZATION ?? `,
[
(this.connectionConfig.searchPath &&
this.connectionConfig.searchPath[0]) ||
'public',
this.connectionConfig.connection.user,
]
);
// }
const schemaName = this.connectionConfig.searchPath?.[0] || 'public';

// Check schemaExists because `CREATE SCHEMA IF NOT EXISTS` requires permissions of `CREATE ON DATABASE`
const schemaExists = !!(
await this.sqlClient.raw(
`SELECT schema_name FROM information_schema.schemata WHERE schema_name = ?`,
[schemaName]
)
).rows?.[0];

if(!schemaExists) {
await this.sqlClient.raw(
`CREATE SCHEMA IF NOT EXISTS ?? AUTHORIZATION ?? `,
[schemaName, this.connectionConfig.connection.user]
);
}

// this.sqlClient = knex(this.connectionConfig);
} catch (e) {
Expand Down