Skip to content

Commit 09d945f

Browse files
committed
fixed unnecessary sqls usage
1 parent e278bb9 commit 09d945f

1 file changed

Lines changed: 8 additions & 32 deletions

File tree

functions/export-metaschema/handler.ts

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { resolve } from 'path';
66

77
type ExportMetaschemaParams = {
88
dbname?: string;
9-
databaseName?: string;
9+
databaseName: string;
1010
author?: string;
1111
extensionName?: string;
1212
metaExtensionName?: string;
@@ -30,44 +30,21 @@ const handler: PgpmFunctionHandler<ExportMetaschemaParams> = async (
3030

3131
const pgPool = getPgPool({ database: dbname });
3232

33-
// Discover database_id and name from metaschema
33+
// Discover database_id from metaschema
3434
const dbsResult = await pgPool.query(
35-
'SELECT id, name FROM metaschema_public.database'
35+
'SELECT id, name FROM metaschema_public.database WHERE name = $1',
36+
[params.databaseName]
3637
);
3738

3839
if (!dbsResult.rows.length) {
39-
throw new Error(`No databases found in metaschema_public.database on ${dbname}`);
40-
}
41-
42-
const targetRow = params.databaseName
43-
? dbsResult.rows.find((r: any) => r.name === params.databaseName)
44-
: dbsResult.rows[0];
45-
46-
if (!targetRow) {
4740
throw new Error(`Database '${params.databaseName}' not found in metaschema_public.database`);
4841
}
4942

43+
const targetRow = dbsResult.rows[0];
44+
5045
const databaseName = targetRow.name;
5146
const database_ids = [targetRow.id];
5247

53-
// Check that sql_actions exist for this database before exporting
54-
const actionsResult = await pgPool.query(
55-
'SELECT count(*)::int AS cnt FROM db_migrate.sql_actions WHERE database_id = $1',
56-
[database_ids[0]]
57-
);
58-
const actionCount = actionsResult.rows[0]?.cnt ?? 0;
59-
60-
if (actionCount === 0) {
61-
log.info('[export-metaschema] No sql_actions found, nothing to export', {
62-
databaseName,
63-
database_id: database_ids[0]
64-
});
65-
return {
66-
complete: false,
67-
reason: `No sql_actions found for database '${databaseName}' (${database_ids[0]}). The database may have been deployed from pre-built packages.`
68-
};
69-
}
70-
7148
// Discover schemas if not provided
7249
let schema_names = params.schema_names;
7350
if (!schema_names?.length) {
@@ -94,8 +71,7 @@ const handler: PgpmFunctionHandler<ExportMetaschemaParams> = async (
9471
databaseName,
9572
database_ids,
9673
extensionName,
97-
schema_names,
98-
actionCount
74+
schema_names
9975
});
10076

10177
project.ensureWorkspace();
@@ -127,7 +103,7 @@ const handler: PgpmFunctionHandler<ExportMetaschemaParams> = async (
127103

128104
log.info('[export-metaschema] Export complete', { outdir });
129105

130-
return { complete: true, outdir, extensionName, metaExtensionName, actionCount };
106+
return { complete: true, outdir, extensionName, metaExtensionName };
131107
};
132108

133109
export default handler;

0 commit comments

Comments
 (0)