@forestadmin/datasource-sql 1.2.6 → 1.2.8
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/index.js +4 -3
- package/package.json +3 -3
package/dist/index.js
CHANGED
|
@@ -14,13 +14,14 @@ function createEmptySequelize(uriOrOptions, logger) {
|
|
|
14
14
|
throw new Error(`Connection Uri "${uriOrOptions}" provided to SQL data source is not valid.` +
|
|
15
15
|
' Should be <dialect>://<connection>.');
|
|
16
16
|
const logging = (sql) => logger?.('Debug', sql.substring(sql.indexOf(':') + 2));
|
|
17
|
+
const getSchema = (uri) => new URL(uri).searchParams.get('schema');
|
|
17
18
|
let sequelize;
|
|
18
19
|
if (typeof uriOrOptions === 'string') {
|
|
19
|
-
sequelize = new sequelize_1.Sequelize(uriOrOptions, { logging });
|
|
20
|
+
sequelize = new sequelize_1.Sequelize(uriOrOptions, { schema: getSchema(uriOrOptions), logging });
|
|
20
21
|
}
|
|
21
22
|
else if (uriOrOptions.uri) {
|
|
22
23
|
const { uri, ...options } = uriOrOptions;
|
|
23
|
-
sequelize = new sequelize_1.Sequelize(uri, { ...options, logging });
|
|
24
|
+
sequelize = new sequelize_1.Sequelize(uri, { ...options, schema: getSchema(uri), logging });
|
|
24
25
|
}
|
|
25
26
|
else {
|
|
26
27
|
sequelize = new sequelize_1.Sequelize({ ...uriOrOptions, logging });
|
|
@@ -49,4 +50,4 @@ function createSqlDataSource(uriOrOptions, options) {
|
|
|
49
50
|
};
|
|
50
51
|
}
|
|
51
52
|
exports.createSqlDataSource = createSqlDataSource;
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBSUEsNEVBQXdFO0FBQ3hFLHlDQUFzQztBQUV0QyxnRkFBd0Q7QUFDeEQsZ0VBQStDO0FBQy9DLHdFQUFzRDtBQUV0RCxTQUFTLG9CQUFvQixDQUFDLFlBQStCLEVBQUUsTUFBYztJQUMzRSxJQUFJLE9BQU8sWUFBWSxLQUFLLFFBQVEsSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDO1FBQ3BFLE1BQU0sSUFBSSxLQUFLLENBQ2IsbUJBQW1CLFlBQVksNkNBQTZDO1lBQzFFLHNDQUFzQyxDQUN6QyxDQUFDO0lBRUosTUFBTSxPQUFPLEdBQUcsQ0FBQyxHQUFXLEVBQUUsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDLE9BQU8sRUFBRSxHQUFHLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN4RixNQUFNLFNBQVMsR0FBRyxDQUFDLEdBQVcsRUFBVSxFQUFFLENBQUMsSUFBSSxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUNuRixJQUFJLFNBQW9CLENBQUM7SUFFekIsSUFBSSxPQUFPLFlBQVksS0FBSyxRQUFRLEVBQUU7UUFDcEMsU0FBUyxHQUFHLElBQUkscUJBQVMsQ0FBQyxZQUFZLEVBQUUsRUFBRSxNQUFNLEVBQUUsU0FBUyxDQUFDLFlBQVksQ0FBQyxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUM7S0FDdkY7U0FBTSxJQUFJLFlBQVksQ0FBQyxHQUFHLEVBQUU7UUFDM0IsTUFBTSxFQUFFLEdBQUcsRUFBRSxHQUFHLE9BQU8sRUFBRSxHQUFHLFlBQVksQ0FBQztRQUN6QyxTQUFTLEdBQUcsSUFBSSxxQkFBUyxDQUFDLEdBQUcsRUFBRSxFQUFFLEdBQUcsT0FBTyxFQUFFLE1BQU0sRUFBRSxTQUFTLENBQUMsR0FBRyxDQUFDLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztLQUNqRjtTQUFNO1FBQ0wsU0FBUyxHQUFHLElBQUkscUJBQVMsQ0FBQyxFQUFFLEdBQUcsWUFBWSxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUM7S0FDekQ7SUFFRCxPQUFPLFNBQVMsQ0FBQztBQUNuQixDQUFDO0FBRU0sS0FBSyxVQUFVLFVBQVUsQ0FDOUIsWUFBK0IsRUFDL0IsTUFBZTtJQUVmLE1BQU0sU0FBUyxHQUFHLG9CQUFvQixDQUFDLFlBQVksRUFBRSxNQUFNLENBQUMsQ0FBQztJQUM3RCxNQUFNLE1BQU0sR0FBRyxNQUFNLHNCQUFZLENBQUMsVUFBVSxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNoRSxNQUFNLFNBQVMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUV4QixPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDO0FBVEQsZ0NBU0M7QUFFTSxLQUFLLFVBQVUsc0JBQXNCLENBQzFDLFlBQStCLEVBQy9CLE1BQWMsRUFDZCxhQUF1QjtJQUV2QixNQUFNLFNBQVMsR0FBRyxvQkFBb0IsQ0FBQyxZQUFZLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDN0QsTUFBTSxNQUFNLEdBQUcsYUFBYSxJQUFJLENBQUMsTUFBTSxzQkFBWSxDQUFDLFVBQVUsQ0FBQyxTQUFTLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQztJQUVuRixlQUFZLENBQUMsWUFBWSxDQUFDLFNBQVMsRUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDckQsbUJBQWUsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FBQztJQUUzRCxPQUFPLFNBQVMsQ0FBQztBQUNuQixDQUFDO0FBWkQsd0RBWUM7QUFFRCxTQUFnQixtQkFBbUIsQ0FDakMsWUFBK0IsRUFDL0IsT0FBb0M7SUFFcEMsT0FBTyxLQUFLLEVBQUUsTUFBYyxFQUFFLEVBQUU7UUFDOUIsTUFBTSxTQUFTLEdBQUcsTUFBTSxzQkFBc0IsQ0FBQyxZQUFZLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxhQUFhLENBQUMsQ0FBQztRQUU3RixPQUFPLElBQUksMENBQW1CLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ3BELENBQUMsQ0FBQztBQUNKLENBQUM7QUFURCxrREFTQyJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forestadmin/datasource-sql",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.8",
|
|
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.2.
|
|
16
|
-
"@forestadmin/datasource-toolkit": "1.4.
|
|
15
|
+
"@forestadmin/datasource-sequelize": "1.2.13",
|
|
16
|
+
"@forestadmin/datasource-toolkit": "1.4.1",
|
|
17
17
|
"pluralize": "^8.0.0",
|
|
18
18
|
"sequelize": "^6.28.0"
|
|
19
19
|
},
|