knex 2.5.0 → 2.5.1

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

@@ -1,17 +1,17 @@
-// Stub Migrate:
-// Used for now in browser builds, where filesystem access isn't
-// available.
-const StubMigrate = (module.exports = function () {});
-
-const noSuchMethod = async function () {
-  throw new Error('Migrations are not supported');
-};
-
-StubMigrate.prototype = {
-  make: noSuchMethod,
-  latest: noSuchMethod,
-  rollback: noSuchMethod,
-  currentVersion: noSuchMethod,
-  up: noSuchMethod,
-  down: noSuchMethod,
-};
+// Stub Migrate:
+// Used for now in browser builds, where filesystem access isn't
+// available.
+const StubMigrate = (module.exports = function () {});
+
+const noSuchMethod = async function () {
+  throw new Error('Migrations are not supported');
+};
+
+StubMigrate.prototype = {
+  make: noSuchMethod,
+  latest: noSuchMethod,
+  rollback: noSuchMethod,
+  currentVersion: noSuchMethod,
+  up: noSuchMethod,
+  down: noSuchMethod,
+};

package/lib/migrations/migrate/migration-list-resolver.js

@@ -1,33 +1,33 @@
-const { getTableName } = require('./table-resolver');
-const { ensureTable } = require('./table-creator');
-
-// Lists all available migration versions, as a sorted array.
-function listAll(migrationSource, loadExtensions) {
-  return migrationSource.getMigrations(loadExtensions);
-}
-
-// Lists all migrations that have been completed for the current db, as an
-// array.
-async function listCompleted(tableName, schemaName, trxOrKnex) {
-  await ensureTable(tableName, schemaName, trxOrKnex);
-
-  return await trxOrKnex
-    .from(getTableName(tableName, schemaName))
-    .orderBy('id')
-    .select('name');
-}
-
-// Gets the migration list from the migration directory specified in config, as well as
-// the list of completed migrations to check what should be run.
-function listAllAndCompleted(config, trxOrKnex) {
-  return Promise.all([
-    listAll(config.migrationSource, config.loadExtensions),
-    listCompleted(config.tableName, config.schemaName, trxOrKnex),
-  ]);
-}
-
-module.exports = {
-  listAll,
-  listAllAndCompleted,
-  listCompleted,
-};
+const { getTableName } = require('./table-resolver');
+const { ensureTable } = require('./table-creator');
+
+// Lists all available migration versions, as a sorted array.
+function listAll(migrationSource, loadExtensions) {
+  return migrationSource.getMigrations(loadExtensions);
+}
+
+// Lists all migrations that have been completed for the current db, as an
+// array.
+async function listCompleted(tableName, schemaName, trxOrKnex) {
+  await ensureTable(tableName, schemaName, trxOrKnex);
+
+  return await trxOrKnex
+    .from(getTableName(tableName, schemaName))
+    .orderBy('id')
+    .select('name');
+}
+
+// Gets the migration list from the migration directory specified in config, as well as
+// the list of completed migrations to check what should be run.
+function listAllAndCompleted(config, trxOrKnex) {
+  return Promise.all([
+    listAll(config.migrationSource, config.loadExtensions),
+    listCompleted(config.tableName, config.schemaName, trxOrKnex),
+  ]);
+}
+
+module.exports = {
+  listAll,
+  listAllAndCompleted,
+  listCompleted,
+};

package/lib/migrations/migrate/migrator-configuration-merger.js

@@ -1,58 +1,58 @@
-const { FsMigrations } = require('./sources/fs-migrations');
-const Logger = require('../../logger');
-const { DEFAULT_LOAD_EXTENSIONS } = require('../common/MigrationsLoader');
-const defaultLogger = new Logger();
-
-const CONFIG_DEFAULT = Object.freeze({
-  extension: 'js',
-  loadExtensions: DEFAULT_LOAD_EXTENSIONS,
-  tableName: 'knex_migrations',
-  schemaName: null,
-  directory: './migrations',
-  disableTransactions: false,
-  disableMigrationsListValidation: false,
-  sortDirsSeparately: false,
-});
-
-function getMergedConfig(config, currentConfig, logger = defaultLogger) {
-  // config is the user specified config, mergedConfig has defaults and current config
-  // applied to it.
-  const mergedConfig = Object.assign(
-    {},
-    CONFIG_DEFAULT,
-    currentConfig || {},
-    config
-  );
-
-  if (
-    config &&
-    // If user specifies any FS related config,
-    // clear specified migrationSource to avoid ambiguity
-    (config.directory ||
-      config.sortDirsSeparately !== undefined ||
-      config.loadExtensions)
-  ) {
-    if (config.migrationSource) {
-      logger.warn(
-        'FS-related option specified for migration configuration. This resets migrationSource to default FsMigrations'
-      );
-    }
-    mergedConfig.migrationSource = null;
-  }
-
-  // If the user has not specified any configs, we need to
-  // default to fs migrations to maintain compatibility
-  if (!mergedConfig.migrationSource) {
-    mergedConfig.migrationSource = new FsMigrations(
-      mergedConfig.directory,
-      mergedConfig.sortDirsSeparately,
-      mergedConfig.loadExtensions
-    );
-  }
-
-  return mergedConfig;
-}
-
-module.exports = {
-  getMergedConfig,
-};
+const { FsMigrations } = require('./sources/fs-migrations');
+const Logger = require('../../logger');
+const { DEFAULT_LOAD_EXTENSIONS } = require('../common/MigrationsLoader');
+const defaultLogger = new Logger();
+
+const CONFIG_DEFAULT = Object.freeze({
+  extension: 'js',
+  loadExtensions: DEFAULT_LOAD_EXTENSIONS,
+  tableName: 'knex_migrations',
+  schemaName: null,
+  directory: './migrations',
+  disableTransactions: false,
+  disableMigrationsListValidation: false,
+  sortDirsSeparately: false,
+});
+
+function getMergedConfig(config, currentConfig, logger = defaultLogger) {
+  // config is the user specified config, mergedConfig has defaults and current config
+  // applied to it.
+  const mergedConfig = Object.assign(
+    {},
+    CONFIG_DEFAULT,
+    currentConfig || {},
+    config
+  );
+
+  if (
+    config &&
+    // If user specifies any FS related config,
+    // clear specified migrationSource to avoid ambiguity
+    (config.directory ||
+      config.sortDirsSeparately !== undefined ||
+      config.loadExtensions)
+  ) {
+    if (config.migrationSource) {
+      logger.warn(
+        'FS-related option specified for migration configuration. This resets migrationSource to default FsMigrations'
+      );
+    }
+    mergedConfig.migrationSource = null;
+  }
+
+  // If the user has not specified any configs, we need to
+  // default to fs migrations to maintain compatibility
+  if (!mergedConfig.migrationSource) {
+    mergedConfig.migrationSource = new FsMigrations(
+      mergedConfig.directory,
+      mergedConfig.sortDirsSeparately,
+      mergedConfig.loadExtensions
+    );
+  }
+
+  return mergedConfig;
+}
+
+module.exports = {
+  getMergedConfig,
+};

package/lib/migrations/migrate/sources/fs-migrations.js

@@ -1,74 +1,74 @@
-const path = require('path');
-const sortBy = require('lodash/sortBy');
-
-const { readdir } = require('../../util/fs');
-const { AbstractMigrationsLoader } = require('../../common/MigrationsLoader');
-
-class FsMigrations extends AbstractMigrationsLoader {
-  /**
-   * Gets the migration names
-   * @returns Promise<string[]>
-   */
-  getMigrations(loadExtensions) {
-    // Get a list of files in all specified migration directories
-    const readMigrationsPromises = this.migrationsPaths.map((configDir) => {
-      const absoluteDir = path.resolve(process.cwd(), configDir);
-      return readdir(absoluteDir).then((files) => ({
-        files,
-        configDir,
-        absoluteDir,
-      }));
-    });
-
-    return Promise.all(readMigrationsPromises).then((allMigrations) => {
-      const migrations = allMigrations.reduce((acc, migrationDirectory) => {
-        // When true, files inside the folder should be sorted
-        if (this.sortDirsSeparately) {
-          migrationDirectory.files = migrationDirectory.files.sort();
-        }
-
-        migrationDirectory.files.forEach((file) =>
-          acc.push({ file, directory: migrationDirectory.configDir })
-        );
-
-        return acc;
-      }, []);
-
-      // If true we have already sorted the migrations inside the folders
-      // return the migrations fully qualified
-      if (this.sortDirsSeparately) {
-        return filterMigrations(
-          this,
-          migrations,
-          loadExtensions || this.loadExtensions
-        );
-      }
-
-      return filterMigrations(
-        this,
-        sortBy(migrations, 'file'),
-        loadExtensions || this.loadExtensions
-      );
-    });
-  }
-
-  getMigrationName(migration) {
-    return migration.file;
-  }
-
-  getMigration(migrationInfo) {
-    return this.getFile(migrationInfo);
-  }
-}
-
-function filterMigrations(migrationSource, migrations, loadExtensions) {
-  return migrations.filter((migration) => {
-    const migrationName = migrationSource.getMigrationName(migration);
-    const extension = path.extname(migrationName);
-    return loadExtensions.includes(extension);
-  });
-}
-
-module.exports = {
-  FsMigrations,
-};
+const path = require('path');
+const sortBy = require('lodash/sortBy');
+
+const { readdir } = require('../../util/fs');
+const { AbstractMigrationsLoader } = require('../../common/MigrationsLoader');
+
+class FsMigrations extends AbstractMigrationsLoader {
+  /**
+   * Gets the migration names
+   * @returns Promise<string[]>
+   */
+  getMigrations(loadExtensions) {
+    // Get a list of files in all specified migration directories
+    const readMigrationsPromises = this.migrationsPaths.map((configDir) => {
+      const absoluteDir = path.resolve(process.cwd(), configDir);
+      return readdir(absoluteDir).then((files) => ({
+        files,
+        configDir,
+        absoluteDir,
+      }));
+    });
+
+    return Promise.all(readMigrationsPromises).then((allMigrations) => {
+      const migrations = allMigrations.reduce((acc, migrationDirectory) => {
+        // When true, files inside the folder should be sorted
+        if (this.sortDirsSeparately) {
+          migrationDirectory.files = migrationDirectory.files.sort();
+        }
+
+        migrationDirectory.files.forEach((file) =>
+          acc.push({ file, directory: migrationDirectory.configDir })
+        );
+
+        return acc;
+      }, []);
+
+      // If true we have already sorted the migrations inside the folders
+      // return the migrations fully qualified
+      if (this.sortDirsSeparately) {
+        return filterMigrations(
+          this,
+          migrations,
+          loadExtensions || this.loadExtensions
+        );
+      }
+
+      return filterMigrations(
+        this,
+        sortBy(migrations, 'file'),
+        loadExtensions || this.loadExtensions
+      );
+    });
+  }
+
+  getMigrationName(migration) {
+    return migration.file;
+  }
+
+  getMigration(migrationInfo) {
+    return this.getFile(migrationInfo);
+  }
+}
+
+function filterMigrations(migrationSource, migrations, loadExtensions) {
+  return migrations.filter((migration) => {
+    const migrationName = migrationSource.getMigrationName(migration);
+    const extension = path.extname(migrationName);
+    return loadExtensions.includes(extension);
+  });
+}
+
+module.exports = {
+  FsMigrations,
+};

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,
+};

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

@@ -1,27 +1,27 @@
-//Get schema-aware table name
-function getTableName(tableName, schemaName) {
-  return schemaName ? `${schemaName}.${tableName}` : tableName;
-}
-
-//Get schema-aware query builder for a given table and schema name
-function getTable(trxOrKnex, tableName, schemaName) {
-  return schemaName
-    ? trxOrKnex(tableName).withSchema(schemaName)
-    : trxOrKnex(tableName);
-}
-function getLockTableName(tableName) {
-  return tableName + '_lock';
-}
-
-function getLockTableNameWithSchema(tableName, schemaName) {
-  return schemaName
-    ? schemaName + '.' + getLockTableName(tableName)
-    : getLockTableName(tableName);
-}
-
-module.exports = {
-  getLockTableName,
-  getLockTableNameWithSchema,
-  getTable,
-  getTableName,
-};
+//Get schema-aware table name
+function getTableName(tableName, schemaName) {
+  return schemaName ? `${schemaName}.${tableName}` : tableName;
+}
+
+//Get schema-aware query builder for a given table and schema name
+function getTable(trxOrKnex, tableName, schemaName) {
+  return schemaName
+    ? trxOrKnex(tableName).withSchema(schemaName)
+    : trxOrKnex(tableName);
+}
+function getLockTableName(tableName) {
+  return tableName + '_lock';
+}
+
+function getLockTableNameWithSchema(tableName, schemaName) {
+  return schemaName
+    ? schemaName + '.' + getLockTableName(tableName)
+    : getLockTableName(tableName);
+}
+
+module.exports = {
+  getLockTableName,
+  getLockTableNameWithSchema,
+  getTable,
+  getTableName,
+};