From 433caeffcef17a855a7167ed3366c9ba5e8aef12 Mon Sep 17 00:00:00 2001 From: halvardssm Date: Thu, 30 Apr 2020 23:26:09 +0200 Subject: [PATCH 1/4] fixed issue with reading remote file --- Makefile | 2 +- cli/state.ts | 14 +++++++++----- {src => cli}/templates/migration.ts | 0 deps.ts | 3 ++- 4 files changed, 12 insertions(+), 7 deletions(-) rename {src => cli}/templates/migration.ts (100%) diff --git a/Makefile b/Makefile index 4cce8f9..f4cd944 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ CONFIG_FILE=./tests/config/mysql.config.ts DB_URL=postgres://${DB_USER}:${DB_PWD@localhost:${DB_PG_PORT}/${DB_NAME} migration-%: - deno run --allow-write --allow-read cli.ts make $* -c ${CONFIG_FILE} + deno run --allow-write --allow-read --allow-net cli.ts make $* -c ${CONFIG_FILE} migrate: deno run --allow-net --allow-read cli.ts migrate -c ${CONFIG_FILE} rollback: diff --git a/cli/state.ts b/cli/state.ts index ad2dfaf..5496761 100644 --- a/cli/state.ts +++ b/cli/state.ts @@ -1,18 +1,18 @@ import { _nessieConfig, nessieConfig } from "../nessie.config.ts"; -import { Denomander } from "../deps.ts"; import { MySQLClient, ClientConfig, PGClient, open, IConnectionParams, + stdConfig, + Denomander, } from "../deps.ts"; import { dbDialects } from "../mod.ts"; import { PGSQL } from "./pgsql.ts"; import { ClientTypes, ClientI } from "./utils.ts"; import { MySQL } from "./mysql.ts"; import { SQLite } from "./sqlite.ts"; -import StdConfig from "../nessie.config.ts"; export class State { private enableDebug: boolean; @@ -32,7 +32,7 @@ export class State { } async init() { - let config: nessieConfig = StdConfig; + let config: nessieConfig = stdConfig; try { const rawConfig = await import( @@ -65,9 +65,13 @@ export class State { await Deno.mkdir(this.migrationFolder, { recursive: true }); - await Deno.copyFile( - "./src/templates/migration.ts", + const responseFile = await fetch( + "https://deno.land/x/nessie/cli/templates/migration.ts", + ); + + await Deno.writeTextFile( `${this.migrationFolder}/${fileName}`, + await responseFile.text(), ); console.info(`Created migration ${fileName} at ${this.migrationFolder}`); diff --git a/src/templates/migration.ts b/cli/templates/migration.ts similarity index 100% rename from src/templates/migration.ts rename to cli/templates/migration.ts diff --git a/deps.ts b/deps.ts index 03d93c2..32f57c5 100644 --- a/deps.ts +++ b/deps.ts @@ -1,6 +1,7 @@ import Denomander from "https://deno.land/x/denomander@0.5.1/mod.ts"; +import stdConfig from "https://deno.land/x/nessie/nessie.config.ts"; -export { Denomander }; +export { Denomander, stdConfig }; export { Client as MySQLClient, ClientConfig, From 4857f086f5deb2b1d1966917a332125b98de1901 Mon Sep 17 00:00:00 2001 From: halvardssm Date: Thu, 30 Apr 2020 23:28:27 +0200 Subject: [PATCH 2/4] updated readme --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 78e519c..53ef05a 100644 --- a/README.md +++ b/README.md @@ -20,16 +20,17 @@ If you have a database system you would like to see in this list, feel free to m * `make [name]`: Create migration -```deno run --allow-read --allow-write https://deno.land/x/nessie/cli.ts make create_users``` + ```deno run --allow-net --allow-read --allow-write https://deno.land/x/nessie/cli.ts make create_users``` * `migrate`: Run migration - will migrate all migrations in your migration folder (sorted by timestamp) newer than the latest migration in your db -```deno run --allow-net --allow-read https://deno.land/x/nessie/cli.ts migrate``` -```deno run --allow-net --allow-read https://deno.land/x/nessie/cli.ts migrate -c ./nessie.config.ts``` + ```deno run --allow-net --allow-read https://deno.land/x/nessie/cli.ts migrate``` + + ```deno run --allow-net --allow-read https://deno.land/x/nessie/cli.ts migrate -c ./nessie.config.ts``` * `rollback`: Rollback - will rollback the latest migration -```deno run --allow-net --allow-read https://deno.land/x/nessie/cli.ts rollback``` + ```deno run --allow-net --allow-read https://deno.land/x/nessie/cli.ts rollback``` ### Flags From 2445d4c7abc589d8124d91b23e157fd5517c279e Mon Sep 17 00:00:00 2001 From: halvardssm Date: Thu, 30 Apr 2020 23:32:12 +0200 Subject: [PATCH 3/4] added version to sqlite deps --- deps.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.ts b/deps.ts index 32f57c5..90c053e 100644 --- a/deps.ts +++ b/deps.ts @@ -12,7 +12,7 @@ export { DB as SQLiteClient, save, open, -} from "https://deno.land/x/sqlite/mod.ts"; +} from "https://deno.land/x/sqlite@v0.1.0/mod.ts"; export { assertEquals, assert, From 14da22d442c4ee6cd40320c2568c3fe87ca78c2c Mon Sep 17 00:00:00 2001 From: halvardssm Date: Thu, 30 Apr 2020 23:38:35 +0200 Subject: [PATCH 4/4] fixed default migration path --- nessie.config.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nessie.config.ts b/nessie.config.ts index d01fd99..af4f520 100644 --- a/nessie.config.ts +++ b/nessie.config.ts @@ -26,7 +26,7 @@ export interface _nessieConfig { } const configPg: nessieConfig = { - migrationFolder: `${Deno.cwd()}/tests/migrations`, + migrationFolder: `${Deno.cwd()}/migrations`, connection: { host: "localhost", port: "5000", @@ -38,7 +38,7 @@ const configPg: nessieConfig = { }; const configMySql: nessieConfig = { - migrationFolder: `${Deno.cwd()}/tests/migrations`, + migrationFolder: `${Deno.cwd()}/migrations`, connection: { hostname: "localhost", port: 5001, @@ -50,8 +50,8 @@ const configMySql: nessieConfig = { }; const configSqLite: nessieConfig = { - migrationFolder: `${Deno.cwd()}/tests/migrations`, - connection: `tests/data/sqlite.db`, + migrationFolder: `${Deno.cwd()}/migrations`, + connection: "sqlite.db", dialect: "sqlite", };