directus 9.4.1 → 9.5.1

package/dist/database/helpers/schema/dialects/oracle.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SchemaHelperOracle = void 0;
+const types_1 = require("../types");
+class SchemaHelperOracle extends types_1.SchemaHelper {
+    async changeToText(table, column, options = {}) {
+        await this.changeToTypeByCopy(table, column, options, (builder, column) => builder.text(column));
+    }
+    async changeToString(table, column, options = {}) {
+        await this.changeToTypeByCopy(table, column, options, (builder, column, options) => builder.string(column, options.length));
+    }
+}
+exports.SchemaHelperOracle = SchemaHelperOracle;

package/dist/database/helpers/schema/index.d.ts

@@ -0,0 +1,7 @@
+export { SchemaHelperDefault as postgres } from './dialects/default';
+export { SchemaHelperCockroachDb as cockroachdb } from './dialects/cockroachdb';
+export { SchemaHelperDefault as redshift } from './dialects/default';
+export { SchemaHelperOracle as oracle } from './dialects/oracle';
+export { SchemaHelperDefault as sqlite } from './dialects/default';
+export { SchemaHelperDefault as mysql } from './dialects/default';
+export { SchemaHelperDefault as mssql } from './dialects/default';

package/dist/database/helpers/schema/index.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mssql = exports.mysql = exports.sqlite = exports.oracle = exports.redshift = exports.cockroachdb = exports.postgres = void 0;
+var default_1 = require("./dialects/default");
+Object.defineProperty(exports, "postgres", { enumerable: true, get: function () { return default_1.SchemaHelperDefault; } });
+var cockroachdb_1 = require("./dialects/cockroachdb");
+Object.defineProperty(exports, "cockroachdb", { enumerable: true, get: function () { return cockroachdb_1.SchemaHelperCockroachDb; } });
+var default_2 = require("./dialects/default");
+Object.defineProperty(exports, "redshift", { enumerable: true, get: function () { return default_2.SchemaHelperDefault; } });
+var oracle_1 = require("./dialects/oracle");
+Object.defineProperty(exports, "oracle", { enumerable: true, get: function () { return oracle_1.SchemaHelperOracle; } });
+var default_3 = require("./dialects/default");
+Object.defineProperty(exports, "sqlite", { enumerable: true, get: function () { return default_3.SchemaHelperDefault; } });
+var default_4 = require("./dialects/default");
+Object.defineProperty(exports, "mysql", { enumerable: true, get: function () { return default_4.SchemaHelperDefault; } });
+var default_5 = require("./dialects/default");
+Object.defineProperty(exports, "mssql", { enumerable: true, get: function () { return default_5.SchemaHelperDefault; } });

package/dist/database/helpers/schema/types.d.ts

@@ -0,0 +1,25 @@
+import { DatabaseHelper } from '../types';
+import { Knex } from 'knex';
+declare type Clients = 'mysql' | 'postgres' | 'cockroachdb' | 'sqlite' | 'oracle' | 'mssql' | 'redshift';
+export declare abstract class SchemaHelper extends DatabaseHelper {
+    isOneOfClients(clients: Clients[]): boolean;
+    changeNullable(table: string, column: string, nullable: boolean): Promise<void>;
+    changeToText(table: string, column: string, options?: {
+        nullable?: boolean;
+        default?: any;
+    }): Promise<void>;
+    changeToInteger(table: string, column: string, options?: {
+        nullable?: boolean;
+        default?: any;
+    }): Promise<void>;
+    changeToString(table: string, column: string, options?: {
+        nullable?: boolean;
+        default?: any;
+        length?: number;
+    }): Promise<void>;
+    protected changeToTypeByCopy<Options extends {
+        nullable?: boolean;
+        default?: any;
+    }>(table: string, column: string, options: Options, cb: (builder: Knex.CreateTableBuilder, column: string, options: Options) => Knex.ColumnBuilder): Promise<void>;
+}
+export {};

package/dist/database/helpers/schema/types.js

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SchemaHelper = void 0;
+const index_1 = require("../../index");
+const types_1 = require("../types");
+class SchemaHelper extends types_1.DatabaseHelper {
+    isOneOfClients(clients) {
+        return clients.includes((0, index_1.getDatabaseClient)(this.knex));
+    }
+    async changeNullable(table, column, nullable) {
+        await this.knex.schema.alterTable(table, (builder) => {
+            if (nullable) {
+                builder.setNullable(column);
+            }
+            else {
+                builder.dropNullable(column);
+            }
+        });
+    }
+    async changeToText(table, column, options = {}) {
+        await this.knex.schema.alterTable(table, (builder) => {
+            const b = builder.string(column);
+            if (options.nullable === true) {
+                b.nullable();
+            }
+            if (options.nullable === false) {
+                b.notNullable();
+            }
+            if (options.default !== undefined) {
+                b.defaultTo(options.default);
+            }
+            b.alter();
+        });
+    }
+    async changeToInteger(table, column, options = {}) {
+        await this.knex.schema.alterTable(table, (builder) => {
+            const b = builder.integer(column);
+            if (options.nullable === true) {
+                b.nullable();
+            }
+            if (options.nullable === false) {
+                b.notNullable();
+            }
+            if (options.default !== undefined) {
+                b.defaultTo(options.default);
+            }
+            b.alter();
+        });
+    }
+    async changeToString(table, column, options = {}) {
+        await this.knex.schema.alterTable(table, (builder) => {
+            const b = builder.string(column, options.length);
+            if (options.nullable === true) {
+                b.nullable();
+            }
+            if (options.nullable === false) {
+                b.notNullable();
+            }
+            if (options.default !== undefined) {
+                b.defaultTo(options.default);
+            }
+            b.alter();
+        });
+    }
+    async changeToTypeByCopy(table, column, options, cb) {
+        await this.knex.schema.alterTable(table, (builder) => {
+            const col = cb(builder, `${column}__temp`, options);
+            if (options.default !== undefined) {
+                col.defaultTo(options.default);
+            }
+            // Force new temporary column to be nullable (required, as there will already be rows in
+            // the table)
+            col.nullable();
+        });
+        await this.knex(table).update(`${column}__temp`, this.knex.ref(column));
+        await this.knex.schema.alterTable(table, (builder) => {
+            builder.dropColumn(column);
+        });
+        await this.knex.schema.alterTable(table, (builder) => {
+            builder.renameColumn(`${column}__temp`, column);
+        });
+        // We're altering the temporary column here. That starts nullable, so we only want to set it
+        // to NOT NULL when applicable
+        if (options.nullable === false) {
+            await this.changeNullable(table, column, options.nullable);
+        }
+    }
+}
+exports.SchemaHelper = SchemaHelper;

package/dist/database/index.d.ts

@@ -4,7 +4,7 @@ export default function getDatabase(): Knex;
 export declare function getSchemaInspector(): ReturnType<typeof SchemaInspector>;
 export declare function hasDatabaseConnection(database?: Knex): Promise<boolean>;
 export declare function validateDatabaseConnection(database?: Knex): Promise<void>;
-export declare function getDatabaseClient(database?: Knex): 'mysql' | 'postgres' | 'sqlite' | 'oracle' | 'mssql' | 'redshift';
+export declare function getDatabaseClient(database?: Knex): 'mysql' | 'postgres' | 'cockroachdb' | 'sqlite' | 'oracle' | 'mssql' | 'redshift';
 export declare function isInstalled(): Promise<boolean>;
 export declare function validateMigrations(): Promise<boolean>;
 /**

package/dist/database/index.js

@@ -24,37 +24,43 @@ function getDatabase() {
     }
     const connectionConfig = (0, get_config_from_env_1.getConfigFromEnv)('DB_', [
         'DB_CLIENT',
+        'DB_VERSION',
         'DB_SEARCH_PATH',
         'DB_CONNECTION_STRING',
         'DB_POOL',
         'DB_EXCLUDE_TABLES',
+        'DB_VERSION',
     ]);
     const poolConfig = (0, get_config_from_env_1.getConfigFromEnv)('DB_POOL');
     const requiredEnvVars = ['DB_CLIENT'];
-    if (env_1.default.DB_CLIENT && env_1.default.DB_CLIENT === 'sqlite3') {
-        requiredEnvVars.push('DB_FILENAME');
-    }
-    else if (env_1.default.DB_CLIENT && env_1.default.DB_CLIENT === 'oracledb') {
-        if (!env_1.default.DB_CONNECT_STRING) {
-            requiredEnvVars.push('DB_HOST', 'DB_PORT', 'DB_DATABASE', 'DB_USER', 'DB_PASSWORD');
-        }
-        else {
-            requiredEnvVars.push('DB_USER', 'DB_PASSWORD', 'DB_CONNECT_STRING');
-        }
-    }
-    else {
-        if (env_1.default.DB_CLIENT === 'pg') {
+    switch (env_1.default.DB_CLIENT) {
+        case 'sqlite3':
+            requiredEnvVars.push('DB_FILENAME');
+            break;
+        case 'oracledb':
+            if (!env_1.default.DB_CONNECT_STRING) {
+                requiredEnvVars.push('DB_HOST', 'DB_PORT', 'DB_DATABASE', 'DB_USER', 'DB_PASSWORD');
+            }
+            else {
+                requiredEnvVars.push('DB_USER', 'DB_PASSWORD', 'DB_CONNECT_STRING');
+            }
+            break;
+        case 'cockroachdb':
+        case 'pg':
             if (!env_1.default.DB_CONNECTION_STRING) {
                 requiredEnvVars.push('DB_HOST', 'DB_PORT', 'DB_DATABASE', 'DB_USER');
             }
-        }
-        else {
+            else {
+                requiredEnvVars.push('DB_CONNECTION_STRING');
+            }
+            break;
+        default:
             requiredEnvVars.push('DB_HOST', 'DB_PORT', 'DB_DATABASE', 'DB_USER', 'DB_PASSWORD');
-        }
     }
     (0, validate_env_1.validateEnv)(requiredEnvVars);
     const knexConfig = {
         client: env_1.default.DB_CLIENT,
+        version: env_1.default.DB_VERSION,
         searchPath: env_1.default.DB_SEARCH_PATH,
         connection: env_1.default.DB_CONNECTION_STRING || connectionConfig,
         log: {
@@ -82,6 +88,15 @@ function getDatabase() {
             callback(null, conn);
         };
     }
+    if (env_1.default.DB_CLIENT === 'cockroachdb') {
+        poolConfig.afterCreate = async (conn, callback) => {
+            logger_1.default.trace('Setting CRDB serial_normalization and default_int_size');
+            const run = (0, util_1.promisify)(conn.query.bind(conn));
+            await run('SET serial_normalization = "sql_sequence"');
+            await run('SET default_int_size = 4');
+            callback(null, conn);
+        };
+    }
     if (env_1.default.DB_CLIENT === 'mssql') {
         // This brings MS SQL in line with the other DB vendors. We shouldn't do any automatic
         // timezone conversion on the database level, especially not when other database vendors don't
@@ -89,12 +104,13 @@ function getDatabase() {
         (0, lodash_1.merge)(knexConfig, { connection: { options: { useUTC: false } } });
     }
     database = (0, knex_1.knex)(knexConfig);
+    validateDatabaseCharset(database);
     const times = {};
     database
         .on('query', (queryInfo) => {
         times[queryInfo.__knexUid] = perf_hooks_1.performance.now();
     })
-        .on('query-response', (response, queryInfo) => {
+        .on('query-response', (_response, queryInfo) => {
         const delta = perf_hooks_1.performance.now() - times[queryInfo.__knexUid];
         logger_1.default.trace(`[${delta.toFixed(3)}ms] ${queryInfo.sql} [${queryInfo.bindings.join(', ')}]`);
         delete times[queryInfo.__knexUid];
@@ -151,6 +167,8 @@ function getDatabaseClient(database) {
             return 'mysql';
         case 'Client_PG':
             return 'postgres';
+        case 'Client_CockroachDB':
+            return 'cockroachdb';
         case 'Client_SQLite3':
             return 'sqlite';
         case 'Client_Oracledb':
@@ -214,3 +232,34 @@ async function validateDatabaseExtensions() {
     }
 }
 exports.validateDatabaseExtensions = validateDatabaseExtensions;
+async function validateDatabaseCharset(database) {
+    database = database !== null && database !== void 0 ? database : getDatabase();
+    if (getDatabaseClient(database) === 'mysql') {
+        if (env_1.default.DB_CHARSET) {
+            logger_1.default.warn(`Using custom DB_CHARSET "${env_1.default.DB_CHARSET}". Using a charset different from the database's default can cause problems in relationships. Omitting DB_CHARSET is strongly recommended.`);
+        }
+        const { collation } = await database.select(database.raw(`@@collation_database as collation`)).first();
+        const tables = await database('information_schema.tables')
+            .select({ name: 'TABLE_NAME', collation: 'TABLE_COLLATION' })
+            .where({ TABLE_SCHEMA: env_1.default.DB_DATABASE });
+        const columns = await database('information_schema.columns')
+            .select({ table_name: 'TABLE_NAME', name: 'COLUMN_NAME', collation: 'COLLATION_NAME' })
+            .where({ TABLE_SCHEMA: env_1.default.DB_DATABASE })
+            .whereNot({ COLLATION_NAME: collation });
+        let inconsistencies = '';
+        for (const table of tables) {
+            const tableColumns = columns.filter((column) => column.table_name === table.name);
+            const tableHasInvalidCollation = table.collation !== collation;
+            if (tableHasInvalidCollation || tableColumns.length > 0) {
+                inconsistencies += `\t\t- Table "${table.name}": "${table.collation}"\n`;
+                for (const column of tableColumns) {
+                    inconsistencies += `\t\t  - Column "${column.name}": "${column.collation}"\n`;
+                }
+            }
+        }
+        if (inconsistencies) {
+            logger_1.default.warn(`Some tables and columns do not match your database's default collation (${collation}):\n${inconsistencies}`);
+        }
+    }
+    return;
+}

package/dist/database/migrations/20201105B-change-webhook-url-type.js

@@ -1,35 +1,16 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
-// @ts-ignore
-const oracledb_1 = __importDefault(require("knex/lib/dialects/oracledb"));
-async function oracleAlterUrl(knex, type) {
-    await knex.raw('ALTER TABLE "directus_webhooks" ADD "url__temp" ?', [knex.raw(type)]);
-    await knex.raw('UPDATE "directus_webhooks" SET "url__temp"="url"');
-    await knex.raw('ALTER TABLE "directus_webhooks" DROP COLUMN "url"');
-    await knex.raw('ALTER TABLE "directus_webhooks" RENAME COLUMN "url__temp" TO "url"');
-    await knex.raw('ALTER TABLE "directus_webhooks" MODIFY "url" NOT NULL');
-}
+const helpers_1 = require("../helpers");
 async function up(knex) {
-    if (knex.client instanceof oracledb_1.default) {
-        await oracleAlterUrl(knex, 'CLOB');
-        return;
-    }
-    await knex.schema.alterTable('directus_webhooks', (table) => {
-        table.text('url').alter();
-    });
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    await helper.changeToText('directus_webhooks', 'url');
 }
 exports.up = up;
 async function down(knex) {
-    if (knex.client instanceof oracledb_1.default) {
-        await oracleAlterUrl(knex, 'VARCHAR2(255)');
-        return;
-    }
-    await knex.schema.alterTable('directus_webhooks', (table) => {
-        table.string('url').notNullable().alter();
+    await (0, helpers_1.getHelpers)(knex).schema.changeToString('directus_webhooks', 'url', {
+        nullable: false,
+        length: 255,
     });
 }
 exports.down = down;

package/dist/database/migrations/20210312A-webhooks-collections-text.js

@@ -1,35 +1,16 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
-// @ts-ignore
-const oracledb_1 = __importDefault(require("knex/lib/dialects/oracledb"));
-async function oracleAlterCollections(knex, type) {
-    await knex.raw('ALTER TABLE "directus_webhooks" ADD "collections__temp" ?', [knex.raw(type)]);
-    await knex.raw('UPDATE "directus_webhooks" SET "collections__temp"="collections"');
-    await knex.raw('ALTER TABLE "directus_webhooks" DROP COLUMN "collections"');
-    await knex.raw('ALTER TABLE "directus_webhooks" RENAME COLUMN "collections__temp" TO "collections"');
-    await knex.raw('ALTER TABLE "directus_webhooks" MODIFY "collections" NOT NULL');
-}
+const helpers_1 = require("../helpers");
 async function up(knex) {
-    if (knex.client instanceof oracledb_1.default) {
-        await oracleAlterCollections(knex, 'CLOB');
-        return;
-    }
-    await knex.schema.alterTable('directus_webhooks', (table) => {
-        table.text('collections').alter();
-    });
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    await helper.changeToText('directus_webhooks', 'collections');
 }
 exports.up = up;
 async function down(knex) {
-    if (knex.client instanceof oracledb_1.default) {
-        await oracleAlterCollections(knex, 'VARCHAR2(255)');
-        return;
-    }
-    await knex.schema.alterTable('directus_webhooks', (table) => {
-        table.string('collections').notNullable().alter();
+    await (0, helpers_1.getHelpers)(knex).schema.changeToString('directus_webhooks', 'collections', {
+        nullable: false,
+        length: 255,
     });
 }
 exports.down = down;

package/dist/database/migrations/20210415A-make-filesize-nullable.js

@@ -1,15 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
+const helpers_1 = require("../helpers");
 async function up(knex) {
-    await knex.schema.alterTable('directus_files', (table) => {
-        table.integer('filesize').nullable().defaultTo(null).alter();
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    await helper.changeToInteger('directus_files', 'filesize', {
+        nullable: true,
+        default: null,
     });
 }
 exports.up = up;
 async function down(knex) {
-    await knex.schema.alterTable('directus_files', (table) => {
-        table.integer('filesize').notNullable().defaultTo(0).alter();
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    await helper.changeToInteger('directus_files', 'filesize', {
+        nullable: false,
+        default: 0,
     });
 }
 exports.down = down;

package/dist/database/migrations/20210506A-rename-interfaces.js

@@ -32,7 +32,7 @@ const changes = [
     ['toggle', 'boolean'],
     ['translations', 'translations'],
     ['tree-view', 'list-o2m-tree-view'],
-    ['user', 'select-dropdown-m2o', { template: '{{avatar.$thumbnail}} {{first_name}} {{last_name}}' }],
+    ['user', 'select-dropdown-m2o', { template: '{{avatar.$thumbnail}} {{first_name}} {{last_name}}' }],
     ['wysiwyg', 'input-rich-text-html'],
     // System:
     ['collection', 'system-collection'],

package/dist/database/migrations/20210510A-restructure-relations.js

@@ -1,24 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
+const helpers_1 = require("../helpers");
 async function up(knex) {
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
     await knex.schema.alterTable('directus_relations', (table) => {
         table.dropColumns('many_primary', 'one_primary');
         table.string('one_deselect_action').defaultTo('nullify');
-        table.string('sort_field', 64).alter();
     });
     await knex('directus_relations').update({ one_deselect_action: 'nullify' });
-    await knex.schema.alterTable('directus_relations', (table) => {
-        table.string('one_deselect_action').notNullable().defaultTo('nullify').alter();
+    await helper.changeToString('directus_relations', 'sort_field', {
+        length: 64,
+    });
+    await helper.changeToString('directus_relations', 'one_deselect_action', {
+        nullable: false,
+        default: 'nullify',
     });
 }
 exports.up = up;
 async function down(knex) {
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    await helper.changeToString('directus_relations', 'sort_field', {
+        length: 255,
+    });
     await knex.schema.alterTable('directus_relations', (table) => {
         table.dropColumn('one_deselect_action');
         table.string('many_primary', 64);
         table.string('one_primary', 64);
-        table.string('sort_field', 255).alter();
     });
 }
 exports.down = down;

package/dist/database/migrations/20210525A-add-insights.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
 async function up(knex) {
     await knex.schema.createTable('directus_dashboards', (table) => {
-        table.uuid('id').primary();
+        table.uuid('id').primary().notNullable();
         table.string('name').notNullable();
         table.string('icon', 30).notNullable().defaultTo('dashboard');
         table.text('note');
@@ -11,7 +11,7 @@ async function up(knex) {
         table.uuid('user_created').references('id').inTable('directus_users').onDelete('SET NULL');
     });
     await knex.schema.createTable('directus_panels', (table) => {
-        table.uuid('id').primary();
+        table.uuid('id').primary().notNullable();
         table.uuid('dashboard').notNullable().references('id').inTable('directus_dashboards').onDelete('CASCADE');
         table.string('name');
         table.string('icon', 30).defaultTo('insert_chart');

package/dist/database/migrations/20210626A-change-filesize-bigint.js

@@ -1,13 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
-// @ts-ignore
-const oracledb_1 = __importDefault(require("knex/lib/dialects/oracledb"));
+const helpers_1 = require("../helpers");
 async function up(knex) {
-    if (knex.client instanceof oracledb_1.default) {
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    if (helper.isOneOfClients(['oracle', 'cockroachdb'])) {
         return;
     }
     await knex.schema.alterTable('directus_files', (table) => {
@@ -16,7 +13,8 @@ async function up(knex) {
 }
 exports.up = up;
 async function down(knex) {
-    if (knex.client instanceof oracledb_1.default) {
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    if (helper.isOneOfClients(['oracle', 'cockroachdb'])) {
         return;
     }
     await knex.schema.alterTable('directus_files', (table) => {

package/dist/database/migrations/20210903A-add-auth-provider.js

@@ -1,14 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
+const helpers_1 = require("../helpers");
 async function up(knex) {
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
     await knex.schema.alterTable('directus_users', (table) => {
         table.dropUnique(['email']);
     });
     await knex.schema.alterTable('directus_users', (table) => {
         table.string('provider', 128).notNullable().defaultTo('default');
         table.string('external_identifier').unique();
-        table.string('email', 128).nullable().alter();
+    });
+    await helper.changeToString('directus_users', 'email', {
+        nullable: true,
+        length: 128,
     });
     await knex.schema.alterTable('directus_users', (table) => {
         table.unique(['email']);
@@ -19,10 +24,14 @@ async function up(knex) {
 }
 exports.up = up;
 async function down(knex) {
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
     await knex.schema.alterTable('directus_users', (table) => {
         table.dropColumn('provider');
         table.dropColumn('external_identifier');
-        table.string('email', 128).notNullable().alter();
+    });
+    await helper.changeToString('directus_users', 'email', {
+        nullable: false,
+        length: 128,
     });
     await knex.schema.alterTable('directus_sessions', (table) => {
         table.dropColumn('data');

package/dist/database/migrations/20210907A-webhooks-collections-not-null.js

@@ -1,30 +1,16 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
-// @ts-ignore
-const oracledb_1 = __importDefault(require("knex/lib/dialects/oracledb"));
+const helpers_1 = require("../helpers");
 async function up(knex) {
-    if (knex.client instanceof oracledb_1.default) {
-        // Oracle is already not nullable due to an oversight in
-        // "20210312A-webhooks-collections-text.ts"
-        return;
-    }
-    await knex.schema.alterTable('directus_webhooks', (table) => {
-        table.text('collections').notNullable().alter();
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    await helper.changeToText('directus_webhooks', 'collections', {
+        nullable: false,
     });
 }
 exports.up = up;
 async function down(knex) {
-    if (knex.client instanceof oracledb_1.default) {
-        // Oracle is already not nullable due to an oversight in
-        // "20210312A-webhooks-collections-text.ts"
-        return;
-    }
-    await knex.schema.alterTable('directus_webhooks', (table) => {
-        table.text('collections').alter();
-    });
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    await helper.changeToText('directus_webhooks', 'collections');
 }
 exports.down = down;

package/dist/database/migrations/20210920A-webhooks-url-not-null.js

@@ -1,30 +1,26 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
-// @ts-ignore
-const oracledb_1 = __importDefault(require("knex/lib/dialects/oracledb"));
+const helpers_1 = require("../helpers");
 async function up(knex) {
-    if (knex.client instanceof oracledb_1.default) {
-        // Oracle is already not nullable due to an oversight in
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    if (helper.isOneOfClients(['oracle', 'cockroachdb'])) {
+        // Oracle and Cockroach are already not nullable due to an oversight in
         // "20201105B-change-webhook-url-type.ts"
         return;
     }
-    await knex.schema.alterTable('directus_webhooks', (table) => {
-        table.text('url').notNullable().alter();
+    await helper.changeToText('directus_webhooks', 'url', {
+        nullable: false,
     });
 }
 exports.up = up;
 async function down(knex) {
-    if (knex.client instanceof oracledb_1.default) {
-        // Oracle is already not nullable due to an oversight in
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    if (helper.isOneOfClients(['oracle', 'cockroachdb'])) {
+        // Oracle and Cockroach are already not nullable due to an oversight in
         // "20201105B-change-webhook-url-type.ts"
         return;
     }
-    await knex.schema.alterTable('directus_webhooks', (table) => {
-        table.text('url').alter();
-    });
+    await helper.changeToText('directus_webhooks', 'url');
 }
 exports.down = down;

package/dist/database/migrations/20211211A-add-shares.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
 async function up(knex) {
     await knex.schema.createTable('directus_shares', (table) => {
-        table.uuid('id').primary();
+        table.uuid('id').primary().notNullable();
         table.string('name');
         table.string('collection', 64).references('collection').inTable('directus_collections').onDelete('CASCADE');
         table.string('item');
@@ -21,7 +21,7 @@ async function up(knex) {
         table.dropColumn('data');
     });
     await knex.schema.alterTable('directus_sessions', (table) => {
-        table.uuid('user').nullable().alter();
+        table.setNullable('user');
         table.uuid('share').references('id').inTable('directus_shares').onDelete('CASCADE');
     });
 }

package/dist/database/migrations/20211230A-add-project-descriptor.d.ts

@@ -0,0 +1,3 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;