Skip to content
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

fix(cli): correctly validate schema #1216

Merged
merged 2 commits into from
Jun 27, 2024
Merged

fix(cli): correctly validate schema #1216

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54b2839
fix(cli): correctly validate schema
Shinigami92 Jun 26, 2024
401ca8a
update types
Shinigami92 Jun 26, 2024
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
10 changes: 7 additions & 3 deletions bin/node-pg-migrate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ let MIGRATIONS_DIR = argv[migrationsDirArg];
let DB_CONNECTION: string | ConnectionParameters | ClientConfig | undefined =
process.env[argv[databaseUrlVarArg]];
let IGNORE_PATTERN = argv[ignorePatternArg];
let SCHEMA = argv[schemaArg];
let SCHEMA: string | string[] | undefined = argv[schemaArg];
let CREATE_SCHEMA = argv[createSchemaArg];
let MIGRATIONS_SCHEMA = argv[migrationsSchemaArg];
let CREATE_MIGRATIONS_SCHEMA = argv[createMigrationsSchemaArg];
Expand Down Expand Up @@ -343,8 +343,12 @@ function isClientConfig(val: unknown): val is ClientConfig & { name?: string } {

function readJson(json: unknown): void {
if (typeof json === 'object' && json !== null) {
SCHEMA = applyIf(SCHEMA, schemaArg, json, (val): val is string[] =>
Array.isArray(val)
SCHEMA = applyIf(
SCHEMA,
schemaArg,
json,
(val): val is string | string[] =>
Array.isArray(val) || (isString(val) && val.length > 0)
);
CREATE_SCHEMA = applyIf(CREATE_SCHEMA, createSchemaArg, json, isBoolean);
MIGRATIONS_DIR = applyIf(MIGRATIONS_DIR, migrationsDirArg, json, isString);
Expand Down