@take-out/postgres 0.0.82 → 0.0.83
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/migrate.cjs +3 -3
- package/dist/cjs/migrate.js +3 -3
- package/dist/cjs/migrate.js.map +1 -1
- package/dist/esm/migrate.js +3 -3
- package/dist/esm/migrate.js.map +1 -1
- package/dist/esm/migrate.mjs +3 -3
- package/dist/esm/migrate.mjs.map +1 -1
- package/package.json +7 -7
- package/src/migrate.ts +5 -3
package/dist/cjs/migrate.cjs
CHANGED
|
@@ -57,13 +57,13 @@ async function migrate(options) {
|
|
|
57
57
|
}
|
|
58
58
|
try {
|
|
59
59
|
await client.query("BEGIN"), await client.query(`
|
|
60
|
-
CREATE TABLE IF NOT EXISTS migrations (
|
|
60
|
+
CREATE TABLE IF NOT EXISTS public.migrations (
|
|
61
61
|
id SERIAL PRIMARY KEY,
|
|
62
62
|
name VARCHAR(255) NOT NULL,
|
|
63
63
|
run_on TIMESTAMP NOT NULL DEFAULT NOW()
|
|
64
64
|
)
|
|
65
65
|
`);
|
|
66
|
-
const appliedMigrations = await client.query("SELECT name FROM migrations"),
|
|
66
|
+
const appliedMigrations = await client.query("SELECT name FROM public.migrations"),
|
|
67
67
|
appliedMigrationNames = new Set(appliedMigrations.rows.map(row => row.name)),
|
|
68
68
|
tsMigrationsSorted = Object.entries(migrationsGlob).sort(([a], [b]) => a.localeCompare(b)).map(([file, run]) => ({
|
|
69
69
|
name: (0, import_node_path.basename)(file).replace(".ts", ""),
|
|
@@ -87,7 +87,7 @@ async function migrate(options) {
|
|
|
87
87
|
}
|
|
88
88
|
})).then(migrations2 => migrations2.filter(Boolean)))].sort((a, b) => a.name.localeCompare(b.name));
|
|
89
89
|
if (!migrations.length) console.info("No migrations to apply!"), await client.query("COMMIT");else {
|
|
90
|
-
for (const migration of migrations) console.info(`Migrating: ${migration.name}`), migration.up && (console.info(`Applying migration: ${migration.name}`), await migration.up(client)), await client.query("INSERT INTO migrations (name) VALUES ($1)", [migration.name]), console.info(`Successfully applied migration: ${migration.name}`);
|
|
90
|
+
for (const migration of migrations) console.info(`Migrating: ${migration.name}`), migration.up && (console.info(`Applying migration: ${migration.name}`), await migration.up(client)), await client.query("INSERT INTO public.migrations (name) VALUES ($1)", [migration.name]), console.info(`Successfully applied migration: ${migration.name}`);
|
|
91
91
|
await client.query("COMMIT"), console.info("Successfully committed all migrations");
|
|
92
92
|
}
|
|
93
93
|
} catch (e) {
|
package/dist/cjs/migrate.js
CHANGED
|
@@ -49,13 +49,13 @@ async function migrate(options) {
|
|
|
49
49
|
}
|
|
50
50
|
try {
|
|
51
51
|
await client.query("BEGIN"), await client.query(`
|
|
52
|
-
CREATE TABLE IF NOT EXISTS migrations (
|
|
52
|
+
CREATE TABLE IF NOT EXISTS public.migrations (
|
|
53
53
|
id SERIAL PRIMARY KEY,
|
|
54
54
|
name VARCHAR(255) NOT NULL,
|
|
55
55
|
run_on TIMESTAMP NOT NULL DEFAULT NOW()
|
|
56
56
|
)
|
|
57
57
|
`);
|
|
58
|
-
const appliedMigrations = await client.query("SELECT name FROM migrations"), appliedMigrationNames = new Set(appliedMigrations.rows.map((row) => row.name)), tsMigrationsSorted = Object.entries(migrationsGlob).sort(([a], [b]) => a.localeCompare(b)).map(([file, run]) => ({
|
|
58
|
+
const appliedMigrations = await client.query("SELECT name FROM public.migrations"), appliedMigrationNames = new Set(appliedMigrations.rows.map((row) => row.name)), tsMigrationsSorted = Object.entries(migrationsGlob).sort(([a], [b]) => a.localeCompare(b)).map(([file, run]) => ({
|
|
59
59
|
name: (0, import_node_path.basename)(file).replace(".ts", ""),
|
|
60
60
|
run
|
|
61
61
|
})).filter(({ name }) => /^[\d]+/.test(name));
|
|
@@ -75,7 +75,7 @@ async function migrate(options) {
|
|
|
75
75
|
console.info("No migrations to apply!"), await client.query("COMMIT");
|
|
76
76
|
else {
|
|
77
77
|
for (const migration of migrations)
|
|
78
|
-
console.info(`Migrating: ${migration.name}`), migration.up && (console.info(`Applying migration: ${migration.name}`), await migration.up(client)), await client.query("INSERT INTO migrations (name) VALUES ($1)", [migration.name]), console.info(`Successfully applied migration: ${migration.name}`);
|
|
78
|
+
console.info(`Migrating: ${migration.name}`), migration.up && (console.info(`Applying migration: ${migration.name}`), await migration.up(client)), await client.query("INSERT INTO public.migrations (name) VALUES ($1)", [migration.name]), console.info(`Successfully applied migration: ${migration.name}`);
|
|
79
79
|
await client.query("COMMIT"), console.info("Successfully committed all migrations");
|
|
80
80
|
}
|
|
81
81
|
} catch (e) {
|
package/dist/cjs/migrate.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/migrate.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAUA,uBAAyB,sBAEzB,qBAA4B;AAoB5B,MAAM,eAAe,CAAC,EACpB,QAAQ,IAAI,4BACZ,QAAQ,IAAI,0BACZ,QAAQ,IAAI,sBACZ,QAAQ,IAAI;AAGd,eAAsB,QAAQ,SAAyB;AACrD,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA,kBAAkB,CAAC;AAAA,IACnB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IAAI;AAEJ,UAAQ,KAAK,qBAAqB,SAAS,qBAAqB,MAAM,KAAK,EAAE,EAAE;AAE/E,QAAM,SAAS,UAAM,gCAAY,EAAE,iBAAiB,CAAC,GAE/C,QAAQ,OAAO,SAAiB;AACpC,UAAM,SAAS,CAAC,EACd,MAAM,OAAO,MAAM;AAAA,qDAC4B,IAAI;AAAA,OAClD,GACD,KAAK;AAEP,mBAAQ,KAAK,SAAS,GAAG,IAAI,eAAe,YAAY,IAAI,KAAK,GAE1D;AAAA,EACT;AAGA,MAAI,SAAS,UAAU;AACrB,QAAI,CAAC;AACH,YAAM,IAAI,MAAM,eAAe;AAGjC,UAAM,cAAc,KAAC,2BAAS,SAAS,EAAE,OAAG,2BAAS,YAAY,EAAE,CAAC,EAAE,OAAO,OAAO;AAEpF,eAAW,QAAQ;AACjB,MAAM,MAAM,MAAM,IAAI,KACpB,MAAM,OAAO,MAAM,mBAAmB,IAAI,GAAG;AAAA,EAGnD;AAGA,aAAW,SAAS,iBAAiB;AACnC,UAAM,WAAO,2BAAS,KAAK;AAC3B,IAAM,MAAM,MAAM,IAAI,KACpB,MAAM,OAAO,MAAM,mBAAmB,IAAI,GAAG;AAAA,EAEjD;AAEA,MAAI;AACF,UAAM,OAAO,MAAM,OAAO,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["migrations"]
|
|
6
6
|
}
|
package/dist/esm/migrate.js
CHANGED
|
@@ -31,13 +31,13 @@ async function migrate(options) {
|
|
|
31
31
|
}
|
|
32
32
|
try {
|
|
33
33
|
await client.query("BEGIN"), await client.query(`
|
|
34
|
-
CREATE TABLE IF NOT EXISTS migrations (
|
|
34
|
+
CREATE TABLE IF NOT EXISTS public.migrations (
|
|
35
35
|
id SERIAL PRIMARY KEY,
|
|
36
36
|
name VARCHAR(255) NOT NULL,
|
|
37
37
|
run_on TIMESTAMP NOT NULL DEFAULT NOW()
|
|
38
38
|
)
|
|
39
39
|
`);
|
|
40
|
-
const appliedMigrations = await client.query("SELECT name FROM migrations"), appliedMigrationNames = new Set(appliedMigrations.rows.map((row) => row.name)), tsMigrationsSorted = Object.entries(migrationsGlob).sort(([a], [b]) => a.localeCompare(b)).map(([file, run]) => ({
|
|
40
|
+
const appliedMigrations = await client.query("SELECT name FROM public.migrations"), appliedMigrationNames = new Set(appliedMigrations.rows.map((row) => row.name)), tsMigrationsSorted = Object.entries(migrationsGlob).sort(([a], [b]) => a.localeCompare(b)).map(([file, run]) => ({
|
|
41
41
|
name: basename(file).replace(".ts", ""),
|
|
42
42
|
run
|
|
43
43
|
})).filter(({ name }) => /^[\d]+/.test(name));
|
|
@@ -57,7 +57,7 @@ async function migrate(options) {
|
|
|
57
57
|
console.info("No migrations to apply!"), await client.query("COMMIT");
|
|
58
58
|
else {
|
|
59
59
|
for (const migration of migrations)
|
|
60
|
-
console.info(`Migrating: ${migration.name}`), migration.up && (console.info(`Applying migration: ${migration.name}`), await migration.up(client)), await client.query("INSERT INTO migrations (name) VALUES ($1)", [migration.name]), console.info(`Successfully applied migration: ${migration.name}`);
|
|
60
|
+
console.info(`Migrating: ${migration.name}`), migration.up && (console.info(`Applying migration: ${migration.name}`), await migration.up(client)), await client.query("INSERT INTO public.migrations (name) VALUES ($1)", [migration.name]), console.info(`Successfully applied migration: ${migration.name}`);
|
|
61
61
|
await client.query("COMMIT"), console.info("Successfully committed all migrations");
|
|
62
62
|
}
|
|
63
63
|
} catch (e) {
|
package/dist/esm/migrate.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/migrate.ts"],
|
|
4
|
-
"mappings": "AAUA,SAAS,gBAAgB;AAEzB,SAAS,mBAAmB;AAoB5B,MAAM,eAAe,CAAC,EACpB,QAAQ,IAAI,4BACZ,QAAQ,IAAI,0BACZ,QAAQ,IAAI,sBACZ,QAAQ,IAAI;AAGd,eAAsB,QAAQ,SAAyB;AACrD,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA,kBAAkB,CAAC;AAAA,IACnB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IAAI;AAEJ,UAAQ,KAAK,qBAAqB,SAAS,qBAAqB,MAAM,KAAK,EAAE,EAAE;AAE/E,QAAM,SAAS,MAAM,YAAY,EAAE,iBAAiB,CAAC,GAE/C,QAAQ,OAAO,SAAiB;AACpC,UAAM,SAAS,CAAC,EACd,MAAM,OAAO,MAAM;AAAA,qDAC4B,IAAI;AAAA,OAClD,GACD,KAAK;AAEP,mBAAQ,KAAK,SAAS,GAAG,IAAI,eAAe,YAAY,IAAI,KAAK,GAE1D;AAAA,EACT;AAGA,MAAI,SAAS,UAAU;AACrB,QAAI,CAAC;AACH,YAAM,IAAI,MAAM,eAAe;AAGjC,UAAM,cAAc,CAAC,SAAS,SAAS,EAAE,GAAG,SAAS,YAAY,EAAE,CAAC,EAAE,OAAO,OAAO;AAEpF,eAAW,QAAQ;AACjB,MAAM,MAAM,MAAM,IAAI,KACpB,MAAM,OAAO,MAAM,mBAAmB,IAAI,GAAG;AAAA,EAGnD;AAGA,aAAW,SAAS,iBAAiB;AACnC,UAAM,OAAO,SAAS,KAAK;AAC3B,IAAM,MAAM,MAAM,IAAI,KACpB,MAAM,OAAO,MAAM,mBAAmB,IAAI,GAAG;AAAA,EAEjD;AAEA,MAAI;AACF,UAAM,OAAO,MAAM,OAAO,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["migrations"]
|
|
6
6
|
}
|
package/dist/esm/migrate.mjs
CHANGED
|
@@ -32,13 +32,13 @@ async function migrate(options) {
|
|
|
32
32
|
}
|
|
33
33
|
try {
|
|
34
34
|
await client.query("BEGIN"), await client.query(`
|
|
35
|
-
CREATE TABLE IF NOT EXISTS migrations (
|
|
35
|
+
CREATE TABLE IF NOT EXISTS public.migrations (
|
|
36
36
|
id SERIAL PRIMARY KEY,
|
|
37
37
|
name VARCHAR(255) NOT NULL,
|
|
38
38
|
run_on TIMESTAMP NOT NULL DEFAULT NOW()
|
|
39
39
|
)
|
|
40
40
|
`);
|
|
41
|
-
const appliedMigrations = await client.query("SELECT name FROM migrations"),
|
|
41
|
+
const appliedMigrations = await client.query("SELECT name FROM public.migrations"),
|
|
42
42
|
appliedMigrationNames = new Set(appliedMigrations.rows.map(row => row.name)),
|
|
43
43
|
tsMigrationsSorted = Object.entries(migrationsGlob).sort(([a], [b]) => a.localeCompare(b)).map(([file, run]) => ({
|
|
44
44
|
name: basename(file).replace(".ts", ""),
|
|
@@ -62,7 +62,7 @@ async function migrate(options) {
|
|
|
62
62
|
}
|
|
63
63
|
})).then(migrations2 => migrations2.filter(Boolean)))].sort((a, b) => a.name.localeCompare(b.name));
|
|
64
64
|
if (!migrations.length) console.info("No migrations to apply!"), await client.query("COMMIT");else {
|
|
65
|
-
for (const migration of migrations) console.info(`Migrating: ${migration.name}`), migration.up && (console.info(`Applying migration: ${migration.name}`), await migration.up(client)), await client.query("INSERT INTO migrations (name) VALUES ($1)", [migration.name]), console.info(`Successfully applied migration: ${migration.name}`);
|
|
65
|
+
for (const migration of migrations) console.info(`Migrating: ${migration.name}`), migration.up && (console.info(`Applying migration: ${migration.name}`), await migration.up(client)), await client.query("INSERT INTO public.migrations (name) VALUES ($1)", [migration.name]), console.info(`Successfully applied migration: ${migration.name}`);
|
|
66
66
|
await client.query("COMMIT"), console.info("Successfully committed all migrations");
|
|
67
67
|
}
|
|
68
68
|
} catch (e) {
|
package/dist/esm/migrate.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["basename","getDBClient","isServerless","process","env","AWS_LAMBDA_FUNCTION_NAME","AWS_LAMBDA_RUNTIME_API","LAMBDA_RUNTIME_DIR","IS_SERVERLESS","migrate","options","connectionString","migrationsGlob","createDatabases","onMigrationComplete","gitSha","cvrDb","changeDb","console","info","client","hasDB","name","result","query","rows","length","Error","zeroDBNames","filter","Boolean","dbUrl","appliedMigrations","appliedMigrationNames","Set","map","row","tsMigrationsSorted","Object","entries","sort","a","b","localeCompare","file","run","replace","test","migrations","Promise","all","has","error","then","migrations2","migration","up","e","release","releaseErr","err","destroyErr","exitProcess","exit"],"sources":["../../src/migrate.ts"],"sourcesContent":[null],"mappings":"AAUA,SAASA,QAAA,QAAgB;AAEzB,SAASC,WAAA,QAAmB;AAoB5B,MAAMC,YAAA,GAAe,CAAC,EACpBC,OAAA,CAAQC,GAAA,CAAIC,wBAAA,IACZF,OAAA,CAAQC,GAAA,CAAIE,sBAAA,IACZH,OAAA,CAAQC,GAAA,CAAIG,kBAAA,IACZJ,OAAA,CAAQC,GAAA,CAAII,aAAA;AAGd,eAAsBC,QAAQC,OAAA,EAAyB;EACrD,MAAM;IACJC,gBAAA;IACAC,cAAA;IACAC,eAAA,GAAkB,EAAC;IACnBC,mBAAA;IACAC,MAAA;IACAC,KAAA;IACAC;EACF,IAAIP,OAAA;EAEJQ,OAAA,CAAQC,IAAA,CAAK,qBAAqBJ,MAAA,GAAS,qBAAqBA,MAAM,KAAK,EAAE,EAAE;EAE/E,MAAMK,MAAA,GAAS,MAAMnB,WAAA,CAAY;MAAEU;IAAiB,CAAC;IAE/CU,KAAA,GAAQ,MAAOC,IAAA,IAAiB;MACpC,MAAMC,MAAA,GAAS,CAAC,EACd,MAAMH,MAAA,CAAOI,KAAA,CAAM;AAAA,qDAC4BF,IAAI;AAAA,OAClD,GACDG,IAAA,CAAKC,MAAA;MAEP,OAAAR,OAAA,CAAQC,IAAA,CAAKI,MAAA,GAAS,GAAGD,IAAI,eAAe,YAAYA,IAAI,KAAK,GAE1DC,MAAA;IACT;EAGA,IAAIP,KAAA,IAASC,QAAA,EAAU;IACrB,IAAI,CAACD,KAAA,EACH,MAAM,IAAIW,KAAA,CAAM,eAAe;IAGjC,MAAMC,WAAA,GAAc,CAAC5B,QAAA,CAASgB,KAAA,IAAS,EAAE,GAAGhB,QAAA,CAASiB,QAAA,IAAY,EAAE,CAAC,EAAEY,MAAA,CAAOC,OAAO;IAEpF,WAAWR,IAAA,IAAQM,WAAA,EACX,OAAMP,KAAA,CAAMC,IAAI,OACpB,MAAMF,MAAA,CAAOI,KAAA,CAAM,mBAAmBF,IAAI,GAAG;EAGnD;EAGA,WAAWS,KAAA,IAASlB,eAAA,EAAiB;IACnC,MAAMS,IAAA,GAAOtB,QAAA,CAAS+B,KAAK;IACrB,OAAMV,KAAA,CAAMC,IAAI,OACpB,MAAMF,MAAA,CAAOI,KAAA,CAAM,mBAAmBF,IAAI,GAAG;EAEjD;EAEA,IAAI;IACF,MAAMF,MAAA,CAAOI,KAAA,CAAM,OAAO,
|
|
1
|
+
{"version":3,"names":["basename","getDBClient","isServerless","process","env","AWS_LAMBDA_FUNCTION_NAME","AWS_LAMBDA_RUNTIME_API","LAMBDA_RUNTIME_DIR","IS_SERVERLESS","migrate","options","connectionString","migrationsGlob","createDatabases","onMigrationComplete","gitSha","cvrDb","changeDb","console","info","client","hasDB","name","result","query","rows","length","Error","zeroDBNames","filter","Boolean","dbUrl","appliedMigrations","appliedMigrationNames","Set","map","row","tsMigrationsSorted","Object","entries","sort","a","b","localeCompare","file","run","replace","test","migrations","Promise","all","has","error","then","migrations2","migration","up","e","release","releaseErr","err","destroyErr","exitProcess","exit"],"sources":["../../src/migrate.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@take-out/postgres",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.83",
|
|
4
4
|
"sideEffects": false,
|
|
5
5
|
"source": "src/index.ts",
|
|
6
6
|
"main": "dist/cjs",
|
|
7
7
|
"module": "dist/esm",
|
|
8
8
|
"type": "module",
|
|
9
|
-
"types": "./
|
|
9
|
+
"types": "./src/index.ts",
|
|
10
10
|
"bin": {
|
|
11
11
|
"postgres": "./cli.cjs"
|
|
12
12
|
},
|
|
@@ -31,29 +31,29 @@
|
|
|
31
31
|
"exports": {
|
|
32
32
|
"./package.json": "./package.json",
|
|
33
33
|
".": {
|
|
34
|
-
"types": "./
|
|
34
|
+
"types": "./src/index.ts",
|
|
35
35
|
"import": "./dist/esm/index.mjs",
|
|
36
36
|
"require": "./dist/cjs/index.cjs",
|
|
37
37
|
"default": "./dist/esm/index.mjs"
|
|
38
38
|
},
|
|
39
39
|
"./migrate": {
|
|
40
|
-
"types": "./
|
|
40
|
+
"types": "./src/migrate.ts",
|
|
41
41
|
"import": "./dist/esm/migrate.mjs",
|
|
42
42
|
"require": "./dist/cjs/migrate.cjs"
|
|
43
43
|
},
|
|
44
44
|
"./build": {
|
|
45
|
-
"types": "./
|
|
45
|
+
"types": "./src/build.ts",
|
|
46
46
|
"import": "./dist/esm/build.mjs",
|
|
47
47
|
"require": "./dist/cjs/build.cjs"
|
|
48
48
|
},
|
|
49
49
|
"./scripts/*": {
|
|
50
|
-
"types": "./
|
|
50
|
+
"types": "./src/scripts/*.ts",
|
|
51
51
|
"import": "./dist/esm/scripts/*.mjs",
|
|
52
52
|
"require": "./dist/cjs/scripts/*.cjs"
|
|
53
53
|
}
|
|
54
54
|
},
|
|
55
55
|
"dependencies": {
|
|
56
|
-
"@take-out/helpers": "
|
|
56
|
+
"@take-out/helpers": "workspace:*",
|
|
57
57
|
"async-retry": "^1.3.3",
|
|
58
58
|
"citty": "^0.1.6"
|
|
59
59
|
},
|
package/src/migrate.ts
CHANGED
|
@@ -89,15 +89,17 @@ export async function migrate(options: MigrateOptions) {
|
|
|
89
89
|
|
|
90
90
|
try {
|
|
91
91
|
await client.query('BEGIN')
|
|
92
|
+
// use public schema explicitly - pg_dump restores into public, and if a schema
|
|
93
|
+
// matching the db user exists (e.g. startchat), unqualified names resolve there first
|
|
92
94
|
await client.query(`
|
|
93
|
-
CREATE TABLE IF NOT EXISTS migrations (
|
|
95
|
+
CREATE TABLE IF NOT EXISTS public.migrations (
|
|
94
96
|
id SERIAL PRIMARY KEY,
|
|
95
97
|
name VARCHAR(255) NOT NULL,
|
|
96
98
|
run_on TIMESTAMP NOT NULL DEFAULT NOW()
|
|
97
99
|
)
|
|
98
100
|
`)
|
|
99
101
|
|
|
100
|
-
const appliedMigrations = await client.query('SELECT name FROM migrations')
|
|
102
|
+
const appliedMigrations = await client.query('SELECT name FROM public.migrations')
|
|
101
103
|
const appliedMigrationNames = new Set(appliedMigrations.rows.map((row) => row.name))
|
|
102
104
|
|
|
103
105
|
// get TypeScript migrations
|
|
@@ -145,7 +147,7 @@ export async function migrate(options: MigrateOptions) {
|
|
|
145
147
|
await migration.up(client)
|
|
146
148
|
}
|
|
147
149
|
|
|
148
|
-
await client.query('INSERT INTO migrations (name) VALUES ($1)', [migration.name])
|
|
150
|
+
await client.query('INSERT INTO public.migrations (name) VALUES ($1)', [migration.name])
|
|
149
151
|
console.info(`Successfully applied migration: ${migration.name}`)
|
|
150
152
|
}
|
|
151
153
|
|