knex 3.0.1 → 3.2.0

package/lib/migrations/migrate/stub/knexfile-eg.stub

@@ -1,43 +1,43 @@
-;; Update with your config settings.
-
-module.exports = {
-   development = {
-      client = 'sqlite3'
-      connection = {
-         filename = './dev.sqlite3'
-      }
-      migrations = {
-         tableName = 'knex_migrations'
-      }
-   }
-   staging = {
-      client = 'postgresql'
-      connection = {
-         database = 'my_db'
-         user     = 'username'
-         password = 'password'
-      }
-      pool = {
-         min = 2
-         max = 10
-      }
-      migrations = {
-         tableName = 'knex_migrations'
-      }
-   }
-   production = {
-      client = 'postgresql'
-      connection = {
-         database = 'my_db'
-         user     = 'username'
-         password = 'password'
-      }
-      pool = {
-         min = 2
-         max = 10
-      }
-      migrations = {
-         tableName = 'knex_migrations'
-      }
-   }
-}
+;; Update with your config settings.
+
+module.exports = {
+   development = {
+      client = 'sqlite3'
+      connection = {
+         filename = './dev.sqlite3'
+      }
+      migrations = {
+         tableName = 'knex_migrations'
+      }
+   }
+   staging = {
+      client = 'postgresql'
+      connection = {
+         database = 'my_db'
+         user     = 'username'
+         password = 'password'
+      }
+      pool = {
+         min = 2
+         max = 10
+      }
+      migrations = {
+         tableName = 'knex_migrations'
+      }
+   }
+   production = {
+      client = 'postgresql'
+      connection = {
+         database = 'my_db'
+         user     = 'username'
+         password = 'password'
+      }
+      pool = {
+         min = 2
+         max = 10
+      }
+      migrations = {
+         tableName = 'knex_migrations'
+      }
+   }
+}

package/lib/migrations/migrate/stub/knexfile-js.stub

@@ -1,47 +1,47 @@
-// Update with your config settings.
-
-/**
- * @type { Object.<string, import("knex").Knex.Config> }
- */
-module.exports = {
-
-  development: {
-    client: 'sqlite3',
-    connection: {
-      filename: './dev.sqlite3'
-    }
-  },
-
-  staging: {
-    client: 'postgresql',
-    connection: {
-      database: 'my_db',
-      user:     'username',
-      password: 'password'
-    },
-    pool: {
-      min: 2,
-      max: 10
-    },
-    migrations: {
-      tableName: 'knex_migrations'
-    }
-  },
-
-  production: {
-    client: 'postgresql',
-    connection: {
-      database: 'my_db',
-      user:     'username',
-      password: 'password'
-    },
-    pool: {
-      min: 2,
-      max: 10
-    },
-    migrations: {
-      tableName: 'knex_migrations'
-    }
-  }
-
-};
+// Update with your config settings.
+
+/**
+ * @type { Object.<string, import("knex").Knex.Config> }
+ */
+module.exports = {
+
+  development: {
+    client: 'sqlite3',
+    connection: {
+      filename: './dev.sqlite3'
+    }
+  },
+
+  staging: {
+    client: 'postgresql',
+    connection: {
+      database: 'my_db',
+      user:     'username',
+      password: 'password'
+    },
+    pool: {
+      min: 2,
+      max: 10
+    },
+    migrations: {
+      tableName: 'knex_migrations'
+    }
+  },
+
+  production: {
+    client: 'postgresql',
+    connection: {
+      database: 'my_db',
+      user:     'username',
+      password: 'password'
+    },
+    pool: {
+      min: 2,
+      max: 10
+    },
+    migrations: {
+      tableName: 'knex_migrations'
+    }
+  }
+
+};

package/lib/migrations/migrate/stub/knexfile-ls.stub

@@ -1,35 +1,35 @@
-# Update with your config settings.
-
-module.exports =
-
-  development:
-    client: 'sqlite3'
-    connection:
-      filename: './dev.sqlite3'
-    migrations:
-      tableName: 'knex_migrations'
-
-  staging:
-    client: 'postgresql'
-    connection:
-      database: 'my_db'
-      user:     'username'
-      password: 'password'
-    pool:
-      min: 2
-      max: 10
-    migrations:
-      tableName: 'knex_migrations'
-
-  production:
-    client: 'postgresql'
-    connection:
-      database: 'my_db'
-      user:     'username'
-      password: 'password'
-    pool:
-      min: 2
-      max: 10
-    migrations:
-      tableName: 'knex_migrations'
-
+# Update with your config settings.
+
+module.exports =
+
+  development:
+    client: 'sqlite3'
+    connection:
+      filename: './dev.sqlite3'
+    migrations:
+      tableName: 'knex_migrations'
+
+  staging:
+    client: 'postgresql'
+    connection:
+      database: 'my_db'
+      user:     'username'
+      password: 'password'
+    pool:
+      min: 2
+      max: 10
+    migrations:
+      tableName: 'knex_migrations'
+
+  production:
+    client: 'postgresql'
+    connection:
+      database: 'my_db'
+      user:     'username'
+      password: 'password'
+    pool:
+      min: 2
+      max: 10
+    migrations:
+      tableName: 'knex_migrations'
+

package/lib/migrations/migrate/stub/knexfile-ts.stub

@@ -1,47 +1,47 @@
-import type { Knex } from "knex";
-
-// Update with your config settings.
-
-const config: { [key: string]: Knex.Config } = {
-  development: {
-    client: "sqlite3",
-    connection: {
-      filename: "./dev.sqlite3"
-    }
-  },
-
-  staging: {
-    client: "postgresql",
-    connection: {
-      database: "my_db",
-      user: "username",
-      password: "password"
-    },
-    pool: {
-      min: 2,
-      max: 10
-    },
-    migrations: {
-      tableName: "knex_migrations"
-    }
-  },
-
-  production: {
-    client: "postgresql",
-    connection: {
-      database: "my_db",
-      user: "username",
-      password: "password"
-    },
-    pool: {
-      min: 2,
-      max: 10
-    },
-    migrations: {
-      tableName: "knex_migrations"
-    }
-  }
-
-};
-
-module.exports = config;
+import type { Knex } from "knex";
+
+// Update with your config settings.
+
+const config: { [key: string]: Knex.Config } = {
+  development: {
+    client: "sqlite3",
+    connection: {
+      filename: "./dev.sqlite3"
+    }
+  },
+
+  staging: {
+    client: "postgresql",
+    connection: {
+      database: "my_db",
+      user: "username",
+      password: "password"
+    },
+    pool: {
+      min: 2,
+      max: 10
+    },
+    migrations: {
+      tableName: "knex_migrations"
+    }
+  },
+
+  production: {
+    client: "postgresql",
+    connection: {
+      database: "my_db",
+      user: "username",
+      password: "password"
+    },
+    pool: {
+      min: 2,
+      max: 10
+    },
+    migrations: {
+      tableName: "knex_migrations"
+    }
+  }
+
+};
+
+module.exports = config;

package/lib/migrations/migrate/stub/ls.stub

@@ -1,14 +1,14 @@
-
-exports.up = (knex, Promise) ->
-  <% if (d.tableName) { %>
-  knex.schema.create-table "<%= d.tableName %>", (t) ->
-    t.increments!
-    t.timestamp!
-  <% } %>
-
-
-exports.down = (knex, Promise) ->
-  <% if (d.tableName) { %>
-  knex.schema.drop-table "<%= d.tableName %>"
-  <% } %>
-
+
+exports.up = (knex, Promise) ->
+  <% if (d.tableName) { %>
+  knex.schema.create-table "<%= d.tableName %>", (t) ->
+    t.increments!
+    t.timestamp!
+  <% } %>
+
+
+exports.down = (knex, Promise) ->
+  <% if (d.tableName) { %>
+  knex.schema.drop-table "<%= d.tableName %>"
+  <% } %>
+

package/lib/migrations/migrate/stub/mjs.stub

@@ -1,23 +1,23 @@
-
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-export const up = async (knex) => {
-  <% if (d.tableName) { %>
-  await knex.schema.createTable("<%= d.tableName %>", function(t) {
-    t.increments();
-    t.timestamp();
-  });
-  <% } %>
-};
-
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-export const down = async (knex) => {
-  <% if (d.tableName) { %>
-  await knex.schema.dropTable("<%= d.tableName %>");
-  <% } %>
-};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+export const up = async (knex) => {
+  <% if (d.tableName) { %>
+  await knex.schema.createTable("<%= d.tableName %>", function(t) {
+    t.increments();
+    t.timestamp();
+  });
+  <% } %>
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+export const down = async (knex) => {
+  <% if (d.tableName) { %>
+  await knex.schema.dropTable("<%= d.tableName %>");
+  <% } %>
+};

package/lib/migrations/migrate/stub/ts-schema.stub

@@ -1,21 +1,21 @@
-import { Knex } from "knex";
-
-<% if (d.tableName) { %>
-export async function up({schema}: Knex): Promise<Knex.SchemaBuilder> {
-    return schema.createTable("<%= d.tableName %>", (t) => {
-        t.increments();
-        t.timestamps();
-    });
-}
-<% } else { %>
-export async function up({schema}: Knex): Promise<void> {
-}
-<% } %>
-<% if (d.tableName) { %>
-export async function down({schema}: Knex): Promise<Knex.SchemaBuilder> {
-    return schema.dropTable("<%= d.tableName %>");
-}
-<% } else { %>
-export async function down({schema}: Knex): Promise<void> {
-}
-<% } %>
+import { Knex } from "knex";
+
+<% if (d.tableName) { %>
+export async function up({schema}: Knex): Promise<Knex.SchemaBuilder> {
+    return schema.createTable("<%= d.tableName %>", (t) => {
+        t.increments();
+        t.timestamps();
+    });
+}
+<% } else { %>
+export async function up({schema}: Knex): Promise<void> {
+}
+<% } %>
+<% if (d.tableName) { %>
+export async function down({schema}: Knex): Promise<Knex.SchemaBuilder> {
+    return schema.dropTable("<%= d.tableName %>");
+}
+<% } else { %>
+export async function down({schema}: Knex): Promise<void> {
+}
+<% } %>

package/lib/migrations/migrate/stub/ts.stub

@@ -1,21 +1,21 @@
-import { Knex } from "knex";
-
-<% if (d.tableName) { %>
-export async function up(knex: Knex): Promise<Knex.SchemaBuilder> {
-    return knex.schema.createTable("<%= d.tableName %>", (t) => {
-        t.increments();
-        t.timestamps();
-    });
-}
-<% } else { %>
-export async function up(knex: Knex): Promise<void> {
-}
-<% } %>
-<% if (d.tableName) { %>
-export async function down(knex: Knex): Promise<Knex.SchemaBuilder> {
-    return knex.schema.dropTable("<%= d.tableName %>");
-}
-<% } else { %>
-export async function down(knex: Knex): Promise<void> {
-}
-<% } %>
+import type { Knex } from "knex";
+
+<% if (d.tableName) { %>
+export async function up(knex: Knex): Promise<Knex.SchemaBuilder> {
+    return knex.schema.createTable("<%= d.tableName %>", (t) => {
+        t.increments();
+        t.timestamps();
+    });
+}
+<% } else { %>
+export async function up(knex: Knex): Promise<void> {
+}
+<% } %>
+<% if (d.tableName) { %>
+export async function down(knex: Knex): Promise<Knex.SchemaBuilder> {
+    return knex.schema.dropTable("<%= d.tableName %>");
+}
+<% } else { %>
+export async function down(knex: Knex): Promise<void> {
+}
+<% } %>

package/lib/migrations/migrate/table-creator.js

@@ -1,77 +1,77 @@
-const {
-  getTable,
-  getLockTableName,
-  getLockTableNameWithSchema,
-  getTableName,
-} = require('./table-resolver');
-
-function ensureTable(tableName, schemaName, trxOrKnex) {
-  const lockTable = getLockTableName(tableName);
-  return getSchemaBuilder(trxOrKnex, schemaName)
-    .hasTable(tableName)
-    .then((exists) => {
-      return !exists && _createMigrationTable(tableName, schemaName, trxOrKnex);
-    })
-    .then(() => {
-      return getSchemaBuilder(trxOrKnex, schemaName).hasTable(lockTable);
-    })
-    .then((exists) => {
-      return (
-        !exists && _createMigrationLockTable(lockTable, schemaName, trxOrKnex)
-      );
-    })
-    .then(() => {
-      return getTable(trxOrKnex, lockTable, schemaName).select('*');
-    })
-    .then((data) => {
-      return (
-        !data.length && _insertLockRowIfNeeded(tableName, schemaName, trxOrKnex)
-      );
-    });
-}
-
-function _createMigrationTable(tableName, schemaName, trxOrKnex) {
-  return getSchemaBuilder(trxOrKnex, schemaName).createTable(
-    getTableName(tableName),
-    function (t) {
-      t.increments();
-      t.string('name');
-      t.integer('batch');
-      t.timestamp('migration_time');
-    }
-  );
-}
-
-function _createMigrationLockTable(tableName, schemaName, trxOrKnex) {
-  return getSchemaBuilder(trxOrKnex, schemaName).createTable(
-    tableName,
-    function (t) {
-      t.increments('index').primary();
-      t.integer('is_locked');
-    }
-  );
-}
-
-function _insertLockRowIfNeeded(tableName, schemaName, trxOrKnex) {
-  const lockTableWithSchema = getLockTableNameWithSchema(tableName, schemaName);
-  return trxOrKnex
-    .select('*')
-    .from(lockTableWithSchema)
-    .then((data) => {
-      return !data.length
-        ? trxOrKnex.from(lockTableWithSchema).insert({ is_locked: 0 })
-        : null;
-    });
-}
-
-//Get schema-aware schema builder for a given schema nam
-function getSchemaBuilder(trxOrKnex, schemaName) {
-  return schemaName
-    ? trxOrKnex.schema.withSchema(schemaName)
-    : trxOrKnex.schema;
-}
-
-module.exports = {
-  ensureTable,
-  getSchemaBuilder,
-};
+const {
+  getTable,
+  getLockTableName,
+  getLockTableNameWithSchema,
+  getTableName,
+} = require('./table-resolver');
+
+function ensureTable(tableName, schemaName, trxOrKnex) {
+  const lockTable = getLockTableName(tableName);
+  return getSchemaBuilder(trxOrKnex, schemaName)
+    .hasTable(tableName)
+    .then((exists) => {
+      return !exists && _createMigrationTable(tableName, schemaName, trxOrKnex);
+    })
+    .then(() => {
+      return getSchemaBuilder(trxOrKnex, schemaName).hasTable(lockTable);
+    })
+    .then((exists) => {
+      return (
+        !exists && _createMigrationLockTable(lockTable, schemaName, trxOrKnex)
+      );
+    })
+    .then(() => {
+      return getTable(trxOrKnex, lockTable, schemaName).select('*');
+    })
+    .then((data) => {
+      return (
+        !data.length && _insertLockRowIfNeeded(tableName, schemaName, trxOrKnex)
+      );
+    });
+}
+
+function _createMigrationTable(tableName, schemaName, trxOrKnex) {
+  return getSchemaBuilder(trxOrKnex, schemaName).createTable(
+    getTableName(tableName),
+    function (t) {
+      t.increments();
+      t.string('name');
+      t.integer('batch');
+      t.timestamp('migration_time');
+    }
+  );
+}
+
+function _createMigrationLockTable(tableName, schemaName, trxOrKnex) {
+  return getSchemaBuilder(trxOrKnex, schemaName).createTable(
+    tableName,
+    function (t) {
+      t.increments('index').primary();
+      t.integer('is_locked');
+    }
+  );
+}
+
+function _insertLockRowIfNeeded(tableName, schemaName, trxOrKnex) {
+  const lockTableWithSchema = getLockTableNameWithSchema(tableName, schemaName);
+  return trxOrKnex
+    .select('*')
+    .from(lockTableWithSchema)
+    .then((data) => {
+      return !data.length
+        ? trxOrKnex.from(lockTableWithSchema).insert({ is_locked: 0 })
+        : null;
+    });
+}
+
+//Get schema-aware schema builder for a given schema nam
+function getSchemaBuilder(trxOrKnex, schemaName) {
+  return schemaName
+    ? trxOrKnex.schema.withSchema(schemaName)
+    : trxOrKnex.schema;
+}
+
+module.exports = {
+  ensureTable,
+  getSchemaBuilder,
+};