@forestadmin/datasource-sql 1.7.37 → 1.7.38
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.
|
@@ -6,6 +6,7 @@ export default class Introspector {
|
|
|
6
6
|
/** Get names of all tables in the public schema of the db */
|
|
7
7
|
private static getTableNames;
|
|
8
8
|
private static getDefaultSchema;
|
|
9
|
+
private static getTableIdentifier;
|
|
9
10
|
/** Instrospect a single table */
|
|
10
11
|
private static getTable;
|
|
11
12
|
private static getColumn;
|
|
@@ -47,15 +47,32 @@ class Introspector {
|
|
|
47
47
|
return undefined;
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
|
+
static getTableIdentifier(tableIdentifier, sequelize) {
|
|
51
|
+
switch (sequelize.getDialect()) {
|
|
52
|
+
case 'postgres':
|
|
53
|
+
case 'mssql':
|
|
54
|
+
case 'sqlite':
|
|
55
|
+
return tableIdentifier;
|
|
56
|
+
case 'mariadb':
|
|
57
|
+
case 'mysql':
|
|
58
|
+
default:
|
|
59
|
+
return { tableName: tableIdentifier.tableName };
|
|
60
|
+
}
|
|
61
|
+
}
|
|
50
62
|
/** Instrospect a single table */
|
|
51
63
|
static async getTable(sequelize, logger, tableIdentifier) {
|
|
52
64
|
const queryInterface = sequelize.getQueryInterface();
|
|
65
|
+
// Sequelize is not consistent in the way it handles table identifiers either when it returns
|
|
66
|
+
// it, when it uses it internally, or when it is passed as an argument.
|
|
67
|
+
// Plus it has some bugs with schema handling in postgresql that forces us to be sure that
|
|
68
|
+
// the table identifier is correct on our side
|
|
69
|
+
const tableIdentifierForQuery = Introspector.getTableIdentifier(tableIdentifier, sequelize);
|
|
53
70
|
const [columnDescriptions, tableIndexes, tableReferences] = await Promise.all([
|
|
54
|
-
queryInterface.describeTable(
|
|
55
|
-
queryInterface.showIndex(
|
|
56
|
-
queryInterface.getForeignKeyReferencesForTable(
|
|
71
|
+
queryInterface.describeTable(tableIdentifierForQuery),
|
|
72
|
+
queryInterface.showIndex(tableIdentifierForQuery),
|
|
73
|
+
queryInterface.getForeignKeyReferencesForTable(tableIdentifierForQuery),
|
|
57
74
|
]);
|
|
58
|
-
await this.detectBrokenRelationship(
|
|
75
|
+
await this.detectBrokenRelationship(tableIdentifierForQuery, sequelize, tableReferences, logger);
|
|
59
76
|
const columns = await Promise.all(Object.entries(columnDescriptions).map(async ([name, description]) => {
|
|
60
77
|
const references = tableReferences.filter(
|
|
61
78
|
// There is a bug right now with sequelize on postgresql: returned association
|
|
@@ -66,8 +83,8 @@ class Introspector {
|
|
|
66
83
|
return this.getColumn(sequelize, logger, tableIdentifier, options);
|
|
67
84
|
}));
|
|
68
85
|
return {
|
|
69
|
-
name:
|
|
70
|
-
schema:
|
|
86
|
+
name: tableIdentifierForQuery.tableName,
|
|
87
|
+
schema: tableIdentifierForQuery.schema,
|
|
71
88
|
columns: columns.filter(Boolean),
|
|
72
89
|
unique: tableIndexes
|
|
73
90
|
.filter(i => i.unique || i.primary)
|
|
@@ -167,4 +184,4 @@ class Introspector {
|
|
|
167
184
|
}
|
|
168
185
|
}
|
|
169
186
|
exports.default = Introspector;
|
|
170
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
187
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"introspector.js","sourceRoot":"","sources":["../../src/introspection/introspector.ts"],"names":[],"mappings":"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"}
|