@forestadmin/datasource-sql 1.7.43 → 1.7.44
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/introspection/dialects/dialect.interface.d.ts +2 -0
- package/dist/introspection/dialects/mssql-dialect.d.ts +2 -0
- package/dist/introspection/dialects/mssql-dialect.js +7 -1
- package/dist/introspection/dialects/mysql-dialect/index.d.ts +2 -0
- package/dist/introspection/dialects/mysql-dialect/index.js +7 -1
- package/dist/introspection/dialects/postgresql-dialect/index.d.ts +2 -0
- package/dist/introspection/dialects/postgresql-dialect/index.js +7 -1
- package/dist/introspection/dialects/sqlite-dialect.d.ts +2 -0
- package/dist/introspection/dialects/sqlite-dialect.js +7 -1
- package/dist/introspection/introspector.d.ts +0 -2
- package/dist/introspection/introspector.js +10 -36
- package/package.json +3 -3
|
@@ -8,5 +8,7 @@ export type ColumnDescription = Omit<SequelizeColumn, 'defaultValue'> & {
|
|
|
8
8
|
};
|
|
9
9
|
export default interface IntrospectionDialect {
|
|
10
10
|
listColumns(tableNames: SequelizeTableIdentifier[], sequelize: Sequelize): Promise<ColumnDescription[][]>;
|
|
11
|
+
getDefaultSchema(sequelize: Sequelize): string;
|
|
12
|
+
getTableIdentifier(tableIdentifier: SequelizeTableIdentifier): SequelizeTableIdentifier;
|
|
11
13
|
}
|
|
12
14
|
//# sourceMappingURL=dialect.interface.d.ts.map
|
|
@@ -2,6 +2,8 @@ import { Sequelize } from 'sequelize';
|
|
|
2
2
|
import IntrospectionDialect, { ColumnDescription } from './dialect.interface';
|
|
3
3
|
import { SequelizeTableIdentifier } from '../type-overrides';
|
|
4
4
|
export default class MsSQLDialect implements IntrospectionDialect {
|
|
5
|
+
getDefaultSchema(): string;
|
|
6
|
+
getTableIdentifier(tableIdentifier: SequelizeTableIdentifier): SequelizeTableIdentifier;
|
|
5
7
|
listColumns(tableNames: SequelizeTableIdentifier[], sequelize: Sequelize): Promise<ColumnDescription[][]>;
|
|
6
8
|
private getColumnDescription;
|
|
7
9
|
/**
|
|
@@ -2,6 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const sequelize_1 = require("sequelize");
|
|
4
4
|
class MsSQLDialect {
|
|
5
|
+
getDefaultSchema() {
|
|
6
|
+
return 'dbo';
|
|
7
|
+
}
|
|
8
|
+
getTableIdentifier(tableIdentifier) {
|
|
9
|
+
return tableIdentifier;
|
|
10
|
+
}
|
|
5
11
|
async listColumns(tableNames, sequelize) {
|
|
6
12
|
if (!sequelize.getDatabaseName())
|
|
7
13
|
throw new Error('Database name is required. Please check your connection settings.');
|
|
@@ -147,4 +153,4 @@ class MsSQLDialect {
|
|
|
147
153
|
}
|
|
148
154
|
}
|
|
149
155
|
exports.default = MsSQLDialect;
|
|
150
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
156
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXNzcWwtZGlhbGVjdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9pbnRyb3NwZWN0aW9uL2RpYWxlY3RzL21zc3FsLWRpYWxlY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5Q0FBa0Q7QUFpQmxELE1BQXFCLFlBQVk7SUFDL0IsZ0JBQWdCO1FBQ2QsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDO0lBRUQsa0JBQWtCLENBQUMsZUFBeUM7UUFDMUQsT0FBTyxlQUFlLENBQUM7SUFDekIsQ0FBQztJQUVELEtBQUssQ0FBQyxXQUFXLENBQ2YsVUFBc0MsRUFDdEMsU0FBb0I7UUFFcEIsSUFBSSxDQUFDLFNBQVMsQ0FBQyxlQUFlLEVBQUU7WUFDOUIsTUFBTSxJQUFJLEtBQUssQ0FBQyxtRUFBbUUsQ0FBQyxDQUFDO1FBQ3ZGLElBQUksQ0FBQyxVQUFVLEVBQUUsTUFBTTtZQUFFLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUVwRCxNQUFNLFVBQVUsR0FBRyxJQUFJLFVBQVU7YUFDOUIsR0FBRyxDQUNGLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxFQUFFLENBQ1gsZ0NBQWdDLEtBQUs7MkNBQ0osS0FBSztjQUNsQyxDQUNQO2FBQ0EsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUM7UUFFbkIsTUFBTSxLQUFLLEdBQUc7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Y0F3Q0osVUFBVSxFQUFFLENBQUM7UUFFdkIsTUFBTSxZQUFZLEdBQUcsVUFBVSxDQUFDLE1BQU0sQ0FDcEMsQ0FBQyxHQUFHLEVBQUUsU0FBUyxFQUFFLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztZQUMxQixHQUFHLEdBQUc7WUFDTixDQUFDLFlBQVksS0FBSyxFQUFFLENBQUMsRUFBRSxTQUFTLENBQUMsU0FBUztZQUMxQyxDQUFDLGFBQWEsS0FBSyxFQUFFLENBQUMsRUFBRSxT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
|
|
@@ -12,6 +12,8 @@ export type MySQLDBColumn = {
|
|
|
12
12
|
Key: string;
|
|
13
13
|
};
|
|
14
14
|
export default class MySQLDialect implements IntrospectionDialect {
|
|
15
|
+
getDefaultSchema(sequelize: Sequelize): string;
|
|
16
|
+
getTableIdentifier(tableIdentifier: SequelizeTableIdentifier): SequelizeTableIdentifier;
|
|
15
17
|
listColumns(tableNames: SequelizeTableIdentifier[], sequelize: Sequelize): Promise<ColumnDescription[][]>;
|
|
16
18
|
private getColumnDescription;
|
|
17
19
|
/**
|
|
@@ -6,6 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const sequelize_1 = require("sequelize");
|
|
7
7
|
const parse_enum_1 = __importDefault(require("./parse-enum"));
|
|
8
8
|
class MySQLDialect {
|
|
9
|
+
getDefaultSchema(sequelize) {
|
|
10
|
+
return sequelize.getDatabaseName();
|
|
11
|
+
}
|
|
12
|
+
getTableIdentifier(tableIdentifier) {
|
|
13
|
+
return { tableName: tableIdentifier.tableName };
|
|
14
|
+
}
|
|
9
15
|
async listColumns(tableNames, sequelize) {
|
|
10
16
|
if (!sequelize.getDatabaseName())
|
|
11
17
|
throw new Error('Database name is required. Please check your connection settings.');
|
|
@@ -90,4 +96,4 @@ class MySQLDialect {
|
|
|
90
96
|
}
|
|
91
97
|
}
|
|
92
98
|
exports.default = MySQLDialect;
|
|
93
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
99
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvaW50cm9zcGVjdGlvbi9kaWFsZWN0cy9teXNxbC1kaWFsZWN0L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEseUNBQWtEO0FBRWxELDhEQUFxQztBQWVyQyxNQUFxQixZQUFZO0lBQy9CLGdCQUFnQixDQUFDLFNBQW9CO1FBQ25DLE9BQU8sU0FBUyxDQUFDLGVBQWUsRUFBRSxDQUFDO0lBQ3JDLENBQUM7SUFFRCxrQkFBa0IsQ0FBQyxlQUF5QztRQUMxRCxPQUFPLEVBQUUsU0FBUyxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsQ0FBQztJQUNsRCxDQUFDO0lBRUQsS0FBSyxDQUFDLFdBQVcsQ0FDZixVQUFzQyxFQUN0QyxTQUFvQjtRQUVwQixJQUFJLENBQUMsU0FBUyxDQUFDLGVBQWUsRUFBRTtZQUM5QixNQUFNLElBQUksS0FBSyxDQUFDLG1FQUFtRSxDQUFDLENBQUM7UUFDdkYsSUFBSSxDQUFDLFVBQVUsRUFBRSxNQUFNO1lBQUUsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBRXBELE1BQU0sT0FBTyxHQUFHLE1BQU0sU0FBUyxDQUFDLEtBQUssQ0FDbkM7Ozs7Ozs7Ozs7Ozs7T0FhQyxFQUNEO1lBQ0UsSUFBSSxFQUFFLHNCQUFVLENBQUMsTUFBTTtZQUN2QixZQUFZLEVBQUU7Z0JBQ1osWUFBWSxFQUFFLFNBQVMsQ0FBQyxlQUFlLEVBQUU7Z0JBQ3pDLFVBQVUsRUFBRSxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQzthQUM3QztTQUNGLENBQ0YsQ0FBQztRQUVGLE9BQU8sVUFBVSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUM1QixNQUFNLFlBQVksR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENB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
|
|
@@ -2,6 +2,8 @@ import { Sequelize } from 'sequelize';
|
|
|
2
2
|
import { SequelizeTableIdentifier } from '../../type-overrides';
|
|
3
3
|
import IntrospectionDialect, { ColumnDescription } from '../dialect.interface';
|
|
4
4
|
export default class PostgreSQLDialect implements IntrospectionDialect {
|
|
5
|
+
getDefaultSchema(): string;
|
|
6
|
+
getTableIdentifier(tableIdentifier: SequelizeTableIdentifier): SequelizeTableIdentifier;
|
|
5
7
|
listColumns(tableNames: SequelizeTableIdentifier[], sequelize: Sequelize): Promise<ColumnDescription[][]>;
|
|
6
8
|
private getColumnDescription;
|
|
7
9
|
/**
|
|
@@ -6,6 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const sequelize_1 = require("sequelize");
|
|
7
7
|
const parse_array_1 = __importDefault(require("./parse-array"));
|
|
8
8
|
class PostgreSQLDialect {
|
|
9
|
+
getDefaultSchema() {
|
|
10
|
+
return 'public';
|
|
11
|
+
}
|
|
12
|
+
getTableIdentifier(tableIdentifier) {
|
|
13
|
+
return tableIdentifier;
|
|
14
|
+
}
|
|
9
15
|
async listColumns(tableNames, sequelize) {
|
|
10
16
|
if (!sequelize.getDatabaseName())
|
|
11
17
|
throw new Error('Database name is required. Please check your connection settings.');
|
|
@@ -150,4 +156,4 @@ class PostgreSQLDialect {
|
|
|
150
156
|
}
|
|
151
157
|
}
|
|
152
158
|
exports.default = PostgreSQLDialect;
|
|
153
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
159
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvaW50cm9zcGVjdGlvbi9kaWFsZWN0cy9wb3N0Z3Jlc3FsLWRpYWxlY3QvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSx5Q0FBa0Q7QUFFbEQsZ0VBQXVDO0FBaUJ2QyxNQUFxQixpQkFBaUI7SUFDcEMsZ0JBQWdCO1FBQ2QsT0FBTyxRQUFRLENBQUM7SUFDbEIsQ0FBQztJQUVELGtCQUFrQixDQUFDLGVBQXlDO1FBQzFELE9BQU8sZUFBZSxDQUFDO0lBQ3pCLENBQUM7SUFFRCxLQUFLLENBQUMsV0FBVyxDQUNmLFVBQXNDLEVBQ3RDLFNBQW9CO1FBRXBCLElBQUksQ0FBQyxTQUFTLENBQUMsZUFBZSxFQUFFO1lBQzlCLE1BQU0sSUFBSSxLQUFLLENBQUMsbUVBQW1FLENBQUMsQ0FBQztRQUN2RixJQUFJLENBQUMsVUFBVSxFQUFFLE1BQU07WUFBRSxPQUFPLEVBQUUsQ0FBQztRQUVuQyxNQUFNLFVBQVUsR0FBRyxJQUFJLFVBQVU7YUFDOUIsR0FBRyxDQUNGLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxFQUFFLENBQ1gsZ0NBQWdDLEtBQUs7MkNBQ0osS0FBSztjQUNsQyxDQUNQO2FBQ0EsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUM7UUFFbkIsK0RBQStEO1FBQy9ELG9DQUFvQztRQUNwQyxNQUFNLEtBQUssR0FBRzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Y0FzQ0osVUFBVTs7S0FFbkIsQ0FBQztRQUVGLE1BQU0sWUFBWSxHQUFHLFVBQVUsQ0FBQyxNQUFNLENBQ3BDLENBQUMsR0FBRyxFQUFFLFNBQVMsRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7WUFDMUIsR0FBRyxHQUFHO1lBQ04sQ0FBQyxZQUFZLEtBQUssRUFBRSxDQUFDLEVBQUUsU0FBUyxDQUFDLFNBQVM7WUFDMUMsQ0FBQyxh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
|
|
@@ -2,6 +2,8 @@ import { Sequelize } from 'sequelize';
|
|
|
2
2
|
import IntrospectionDialect, { ColumnDescription } from './dialect.interface';
|
|
3
3
|
import { SequelizeTableIdentifier } from '../type-overrides';
|
|
4
4
|
export default class SQLiteDialect implements IntrospectionDialect {
|
|
5
|
+
getDefaultSchema(): string;
|
|
6
|
+
getTableIdentifier(tableIdentifier: SequelizeTableIdentifier): SequelizeTableIdentifier;
|
|
5
7
|
listColumns(tableNames: SequelizeTableIdentifier[], sequelize: Sequelize): Promise<ColumnDescription[][]>;
|
|
6
8
|
private listColumnsForTable;
|
|
7
9
|
private mapDefaultValue;
|
|
@@ -2,6 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const sequelize_1 = require("sequelize");
|
|
4
4
|
class SQLiteDialect {
|
|
5
|
+
getDefaultSchema() {
|
|
6
|
+
return undefined;
|
|
7
|
+
}
|
|
8
|
+
getTableIdentifier(tableIdentifier) {
|
|
9
|
+
return tableIdentifier;
|
|
10
|
+
}
|
|
5
11
|
listColumns(tableNames, sequelize) {
|
|
6
12
|
if (!tableNames?.length)
|
|
7
13
|
return Promise.resolve([]);
|
|
@@ -60,4 +66,4 @@ class SQLiteDialect {
|
|
|
60
66
|
}
|
|
61
67
|
}
|
|
62
68
|
exports.default = SQLiteDialect;
|
|
63
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3FsaXRlLWRpYWxlY3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvaW50cm9zcGVjdGlvbi9kaWFsZWN0cy9zcWxpdGUtZGlhbGVjdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHlDQUFrRDtBQWNsRCxNQUFxQixhQUFhO0lBQ2hDLGdCQUFnQjtRQUNkLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFFRCxrQkFBa0IsQ0FBQyxlQUF5QztRQUMxRCxPQUFPLGVBQWUsQ0FBQztJQUN6QixDQUFDO0lBRUQsV0FBVyxDQUNULFVBQXNDLEVBQ3RDLFNBQW9CO1FBRXBCLElBQUksQ0FBQyxVQUFVLEVBQUUsTUFBTTtZQUFFLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUVwRCxPQUFPLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2xHLENBQUM7SUFFTyxLQUFLLENBQUMsbUJBQW1CLENBQy9CLGVBQXlDLEVBQ3pDLFNBQW9CO1FBRXBCLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDLENBQUMsR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUM7WUFDN0MsU0FBUyxDQUFDLEtBQUssQ0FBVywrQkFBK0IsRUFBRTtnQkFDekQsSUFBSSxFQUFFLHNCQUFVLENBQUMsTUFBTTtnQkFDdkIsWUFBWSxFQUFFLEVBQUUsU0FBUyxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUU7YUFDdkQsQ0FBQztZQUNGLFNBQVMsQ0FBQyxLQUFLLENBQVUseURBQXlELEVBQUU7Z0JBQ2xGLElBQUksRUFBRSxzQkFBVSxDQUFDLE1BQU07Z0JBQ3ZCLFlBQVksRUFBRSxFQUFFLFNBQVMsRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFFO2FBQ3ZELENBQUM7U0FDSCxDQUFDLENBQUM7UUFFSCxPQUFPLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUU7WUFDMUIsTUFBTSxVQUFVLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUV0QyxPQUFPO2dCQUNMLElBQUksRUFBRSxNQUFNLENBQUMsSUFBSTtnQkFDakIsSUFBSSxFQUFFLE1BQU0sQ0FBQyxJQUFJO2dCQUNqQixTQUFTLEVBQUUsQ0FBQyxNQUFNLENBQUMsT0FBTyxJQUFJLENBQUMsVUFBVTtnQkFDekMsVUFBVTtnQkFDVix5REFBeUQ7Z0JBQ3pELHdDQUF3QztnQkFDeEMsYUFBYSxFQUFFLFVBQVUsSUFBSSxHQUFHLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FBQztnQkFDMUQsT0FBTyxFQUFFLElBQUk7Z0JBQ2IsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLE1BQU0sQ0FBQztnQkFDL0IsVUFBVSxFQUFFLElBQUk7YUFDakIsQ0FBQztRQUNKLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVPLGVBQWUsQ0FBQyxNQUFnQjtRQUl0QyxJQUFJLE1BQU0sQ0FBQyxVQUFVLEtBQUssSUFBSSxJQUFJLE1BQU0sQ0FBQyxVQUFVLEVBQUUsV0FBVyxFQUFFLEtBQUssTUFBTSxFQUFFO1lBQzdFLE9BQU87Z0JBQ0wsWUFBWSxFQUFFLElBQUk7Z0JBQ2xCLHFCQUFxQixFQUFFLEtBQUs7YUFDN0IsQ0FBQztTQUNIO1FBRUQsSUFBSSxNQUFNLENBQUMsVUFBVSxFQUFFLFVBQVUsQ0FBQyxHQUFHLENBQUMsSUFBSSxNQUFNLENBQUMsVUFBVSxFQUFFLFFBQVEsQ0FBQyxHQUFHLENBQUMsRUFBRTtZQUMxRSxPQUFPO2dCQUNMLFlBQVksRUFBRSxNQUFNLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQztnQkFDaEUscUJBQXFCLEVBQUUsS0FBSzthQUM3QixDQUFDO1NBQ0g7UUFFRCxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDLEVBQUU7WUFDNUMsT0FBTztnQkFDTCxZQUFZLEVBQUUsTUFBTSxDQUFDLFVBQVU7Z0JBQy9CLHFCQUFxQixFQUFFLEtBQUs7YUFDN0IsQ0FBQztTQUNIO1FBRUQsT0FBTztZQUNMLFlBQVksRUFBRSxNQUFNLENBQUMsVUFBVTtZQUMvQixxQkFBcUIsRUFBRSxJQUFJO1NBQzVCLENBQUM7SUFDSixDQUFDO0NBQ0Y7QUFqRkQsZ0NBaUZDIn0=
|
|
@@ -5,8 +5,6 @@ export default class Introspector {
|
|
|
5
5
|
static introspect(sequelize: Sequelize, logger?: Logger): Promise<Table[]>;
|
|
6
6
|
/** Get names of all tables in the public schema of the db */
|
|
7
7
|
private static getTableNames;
|
|
8
|
-
private static getDefaultSchema;
|
|
9
|
-
private static getTableIdentifier;
|
|
10
8
|
private static getTables;
|
|
11
9
|
/** Instrospect a single table */
|
|
12
10
|
private static getTable;
|
|
@@ -8,17 +8,18 @@ const default_value_parser_1 = __importDefault(require("./helpers/default-value-
|
|
|
8
8
|
const sql_type_converter_1 = __importDefault(require("./helpers/sql-type-converter"));
|
|
9
9
|
class Introspector {
|
|
10
10
|
static async introspect(sequelize, logger) {
|
|
11
|
-
const
|
|
12
|
-
const
|
|
11
|
+
const dialect = (0, dialect_factory_1.default)(sequelize.getDialect());
|
|
12
|
+
const tableNames = await this.getTableNames(dialect, sequelize);
|
|
13
|
+
const tables = await this.getTables(dialect, tableNames, sequelize, logger);
|
|
13
14
|
this.sanitizeInPlace(tables, logger);
|
|
14
15
|
return tables;
|
|
15
16
|
}
|
|
16
17
|
/** Get names of all tables in the public schema of the db */
|
|
17
|
-
static async getTableNames(sequelize) {
|
|
18
|
+
static async getTableNames(dialect, sequelize) {
|
|
18
19
|
const tableIdentifiers = await sequelize
|
|
19
20
|
.getQueryInterface()
|
|
20
21
|
.showAllTables();
|
|
21
|
-
const requestedSchema = sequelize.options.schema ||
|
|
22
|
+
const requestedSchema = sequelize.options.schema || dialect.getDefaultSchema(sequelize);
|
|
22
23
|
// Sometimes sequelize returns only strings,
|
|
23
24
|
// and sometimes objects with a tableName and schema property.
|
|
24
25
|
// @see https://github.com/sequelize/sequelize/blob/main/src/dialects/mariadb/query.js#L295
|
|
@@ -32,48 +33,21 @@ class Introspector {
|
|
|
32
33
|
// MSSQL returns all tables, not filtered by schema
|
|
33
34
|
.filter(identifier => identifier.schema === requestedSchema));
|
|
34
35
|
}
|
|
35
|
-
static
|
|
36
|
-
switch (sequelize.getDialect()) {
|
|
37
|
-
case 'postgres':
|
|
38
|
-
return 'public';
|
|
39
|
-
case 'mssql':
|
|
40
|
-
return 'dbo';
|
|
41
|
-
// MariaDB returns the database name as "schema" in table identifiers
|
|
42
|
-
case 'mariadb':
|
|
43
|
-
case 'mysql':
|
|
44
|
-
return sequelize.getDatabaseName();
|
|
45
|
-
default:
|
|
46
|
-
return undefined;
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
static getTableIdentifier(tableIdentifier, sequelize) {
|
|
50
|
-
switch (sequelize.getDialect()) {
|
|
51
|
-
case 'postgres':
|
|
52
|
-
case 'mssql':
|
|
53
|
-
case 'sqlite':
|
|
54
|
-
return tableIdentifier;
|
|
55
|
-
case 'mariadb':
|
|
56
|
-
case 'mysql':
|
|
57
|
-
default:
|
|
58
|
-
return { tableName: tableIdentifier.tableName };
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
static async getTables(tableNames, sequelize, logger) {
|
|
62
|
-
const dialect = (0, dialect_factory_1.default)(sequelize.getDialect());
|
|
36
|
+
static async getTables(dialect, tableNames, sequelize, logger) {
|
|
63
37
|
const tablesColumns = await dialect.listColumns(tableNames, sequelize);
|
|
64
38
|
return Promise.all(tableNames.map((tableIdentifier, index) => {
|
|
65
39
|
const columnDescriptions = tablesColumns[index];
|
|
66
|
-
return this.getTable(sequelize, tableIdentifier, columnDescriptions, logger);
|
|
40
|
+
return this.getTable(dialect, sequelize, tableIdentifier, columnDescriptions, logger);
|
|
67
41
|
}));
|
|
68
42
|
}
|
|
69
43
|
/** Instrospect a single table */
|
|
70
|
-
static async getTable(sequelize, tableIdentifier, columnDescriptions, logger) {
|
|
44
|
+
static async getTable(dialect, sequelize, tableIdentifier, columnDescriptions, logger) {
|
|
71
45
|
const queryInterface = sequelize.getQueryInterface();
|
|
72
46
|
// Sequelize is not consistent in the way it handles table identifiers either when it returns
|
|
73
47
|
// it, when it uses it internally, or when it is passed as an argument.
|
|
74
48
|
// Plus it has some bugs with schema handling in postgresql that forces us to be sure that
|
|
75
49
|
// the table identifier is correct on our side
|
|
76
|
-
const tableIdentifierForQuery =
|
|
50
|
+
const tableIdentifierForQuery = dialect.getTableIdentifier(tableIdentifier);
|
|
77
51
|
const [tableIndexes, tableReferences] = await Promise.all([
|
|
78
52
|
queryInterface.showIndex(tableIdentifierForQuery),
|
|
79
53
|
queryInterface.getForeignKeyReferencesForTable(tableIdentifierForQuery),
|
|
@@ -164,4 +138,4 @@ class Introspector {
|
|
|
164
138
|
}
|
|
165
139
|
}
|
|
166
140
|
exports.default = Introspector;
|
|
167
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
141
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50cm9zcGVjdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ludHJvc3BlY3Rpb24vaW50cm9zcGVjdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBR0EsaUZBQXFFO0FBRXJFLDBGQUFnRTtBQUNoRSxzRkFBNEQ7QUFTNUQsTUFBcUIsWUFBWTtJQUMvQixNQUFNLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxTQUFvQixFQUFFLE1BQWU7UUFDM0QsTUFBTSxPQUFPLEdBQUcsSUFBQSx5QkFBMkIsRUFBQyxTQUFTLENBQUMsVUFBVSxFQUFhLENBQUMsQ0FBQztRQUUvRSxNQUFNLFVBQVUsR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsT0FBTyxFQUFFLFNBQWlDLENBQUMsQ0FBQztRQUN4RixNQUFNLE1BQU0sR0FBRyxNQUFNLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxFQUFFLFVBQVUsRUFBRSxTQUFTLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFFNUUsSUFBSSxDQUFDLGVBQWUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFFckMsT0FBTyxNQUFNLENBQUM7SUFDaEIsQ0FBQztJQUVELDZEQUE2RDtJQUNyRCxNQUFNLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FDaEMsT0FBNkIsRUFDN0IsU0FBK0I7UUFFL0IsTUFBTSxnQkFBZ0IsR0FBdUMsTUFBTSxTQUFTO2FBQ3pFLGlCQUFpQixFQUFFO2FBQ25CLGFBQWEsRUFBRSxDQUFDO1FBRW5CLE1BQU0sZUFBZSxHQUFHLFNBQVMsQ0FBQyxPQUFPLENBQUMsTUFBTSxJQUFJLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUV4Riw0Q0FBNEM7UUFDNUMsOERBQThEO1FBQzlELDJGQUEyRjtRQUMzRixPQUFPLENBQ0wsZ0JBQWdCO2FBQ2IsR0FBRyxDQUFDLENBQUMsZUFBa0QsRUFBRSxFQUFFLENBQzFELE9BQU8sZUFBZSxL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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forestadmin/datasource-sql",
|
|
3
|
-
"version": "1.7.
|
|
3
|
+
"version": "1.7.44",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "GPL-3.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -12,8 +12,8 @@
|
|
|
12
12
|
"directory": "packages/datasource-sql"
|
|
13
13
|
},
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"@forestadmin/datasource-sequelize": "1.5.
|
|
16
|
-
"@forestadmin/datasource-toolkit": "1.29.
|
|
15
|
+
"@forestadmin/datasource-sequelize": "1.5.27",
|
|
16
|
+
"@forestadmin/datasource-toolkit": "1.29.2",
|
|
17
17
|
"pluralize": "^8.0.0",
|
|
18
18
|
"sequelize": "^6.28.0",
|
|
19
19
|
"socks": "^2.7.1",
|