feat(postgres): allow schema creation for postgres (#1247)

* feat(postgres): allow schema creation during createDatabase * feat(postgres): add schema option to createPostgresDatabase and buildDriverOptions
tada5hi · Jan 24, 2025 · 986ff58 · 986ff58
1 parent ca465a6
commit 986ff58
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/src/database/driver/postgres.ts b/src/database/driver/postgres.ts
@@ -24,6 +24,7 @@ export async function createSimplePostgresConnection(
         user: options.user,
         password: options.password,
         ssl: options.ssl,
+        schema: options.schema,
         ...(options.extra ? options.extra : {}),
     };
 
@@ -90,9 +91,17 @@ export async function createPostgresDatabase(
     if (typeof options.characterSet === 'string') {
         query += ` WITH ENCODING '${options.characterSet}'`;
     }
-
     const result = await executeSimplePostgresQuery(connection, query);
 
+    if (typeof options.schema === 'string' && options.schema !== 'public') {
+        const schemaConnection = await createSimplePostgresConnection(driver, options, {
+            ...context,
+            initialDatabase: options.database,
+        });
+        const schemaQuery = `CREATE SCHEMA IF NOT EXISTS "${options.schema}"`;
+        await executeSimplePostgresQuery(schemaConnection, schemaQuery);
+    }
+
     if (context.synchronize) {
         await synchronizeDatabaseSchema(context.options);
     }

diff --git a/src/database/driver/type.ts b/src/database/driver/type.ts
@@ -18,6 +18,9 @@ export type DriverOptions = {
     charset?: string,
     characterSet?: string,
 
+    // postgres specific
+    schema?: string
+
     extra?: {
         [key: string]: any
     }

diff --git a/src/database/driver/utils/build.ts b/src/database/driver/utils/build.ts
@@ -41,5 +41,6 @@ export function buildDriverOptions(options: DataSourceOptions): DriverOptions {
         ...(driverOptions.serviceName ? { serviceName: driverOptions.serviceName } : {}),
         ...(options.extra ? { extra: options.extra } : {}),
         ...(driverOptions.domain ? { domain: driverOptions.domain } : {}),
+        ...(driverOptions.schema ? { schema: driverOptions.schema } : {}),
     };
 }