@steedos/objectql 3.0.0-beta.61 → 3.0.0-beta.62
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/lib/typeorm/util.js +8 -9
- package/lib/typeorm/util.js.map +1 -1
- package/package.json +12 -12
package/lib/typeorm/util.js
CHANGED
|
@@ -5,7 +5,6 @@ exports.getTableColumns = getTableColumns;
|
|
|
5
5
|
exports.getEntity = getEntity;
|
|
6
6
|
exports.getEntities = getEntities;
|
|
7
7
|
exports.getPrimaryKeys = getPrimaryKeys;
|
|
8
|
-
var tslib_1 = require("tslib");
|
|
9
8
|
var typeorm_1 = require("typeorm");
|
|
10
9
|
var driver_1 = require("../driver");
|
|
11
10
|
function getTableColumnType(field, databaseType) {
|
|
@@ -36,7 +35,6 @@ function getTableColumnType(field, databaseType) {
|
|
|
36
35
|
}
|
|
37
36
|
return columnType || String;
|
|
38
37
|
}
|
|
39
|
-
;
|
|
40
38
|
function getTableColumns(fields, object, databaseType) {
|
|
41
39
|
var columns = {};
|
|
42
40
|
var primaryColumnCount = 0;
|
|
@@ -56,20 +54,21 @@ function getTableColumns(fields, object, databaseType) {
|
|
|
56
54
|
nullable: nullable,
|
|
57
55
|
primary: field.primary,
|
|
58
56
|
generated: field.generated,
|
|
59
|
-
precision: field.precision
|
|
60
|
-
|
|
57
|
+
precision: field.precision
|
|
58
|
+
? field.precision
|
|
59
|
+
: field.scale
|
|
60
|
+
? 18
|
|
61
|
+
: undefined,
|
|
62
|
+
scale: field.scale,
|
|
61
63
|
};
|
|
62
64
|
if (databaseType === "postgres") {
|
|
63
65
|
if (field.multiple) {
|
|
64
|
-
columns[fieldName][
|
|
66
|
+
columns[fieldName]["array"] = true;
|
|
65
67
|
}
|
|
66
68
|
}
|
|
67
69
|
if (field.column_name) {
|
|
68
70
|
columns[fieldName]["name"] = field.column_name;
|
|
69
71
|
}
|
|
70
|
-
if (field.primary) {
|
|
71
|
-
columns['_id'] = tslib_1.__assign(tslib_1.__assign({}, columns[fieldName]), { name: field.column_name || fieldName, generated: false, primary: false, nullable: true, insert: false, update: false });
|
|
72
|
-
}
|
|
73
72
|
}
|
|
74
73
|
if (!primaryColumnCount) {
|
|
75
74
|
return null;
|
|
@@ -91,7 +90,7 @@ function getEntity(object, databaseType) {
|
|
|
91
90
|
name: tableName,
|
|
92
91
|
tableName: tableName,
|
|
93
92
|
columns: columns,
|
|
94
|
-
type: type
|
|
93
|
+
type: type,
|
|
95
94
|
});
|
|
96
95
|
}
|
|
97
96
|
function getEntities(objects, databaseType) {
|
package/lib/typeorm/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/typeorm/util.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/typeorm/util.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/objectql",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "3.0.0-beta.
|
|
4
|
+
"version": "3.0.0-beta.62",
|
|
5
5
|
"description": "",
|
|
6
6
|
"main": "lib/index.js",
|
|
7
7
|
"scripts": {
|
|
@@ -16,16 +16,16 @@
|
|
|
16
16
|
"dependencies": {
|
|
17
17
|
"@salesforce/kit": "1.0.4",
|
|
18
18
|
"@salesforce/ts-types": "1.1.1",
|
|
19
|
-
"@steedos/cachers": "3.0.0-beta.
|
|
20
|
-
"@steedos/filters": "3.0.0-beta.
|
|
21
|
-
"@steedos/formula": "3.0.0-beta.
|
|
22
|
-
"@steedos/i18n": "3.0.0-beta.
|
|
23
|
-
"@steedos/metadata-core": "3.0.0-beta.
|
|
24
|
-
"@steedos/metadata-registrar": "3.0.0-beta.
|
|
25
|
-
"@steedos/odata-v4-mongodb": "3.0.0-beta.
|
|
26
|
-
"@steedos/odata-v4-sql": "3.0.0-beta.
|
|
27
|
-
"@steedos/odata-v4-typeorm": "3.0.0-beta.
|
|
28
|
-
"@steedos/schemas": "3.0.0-beta.
|
|
19
|
+
"@steedos/cachers": "3.0.0-beta.62",
|
|
20
|
+
"@steedos/filters": "3.0.0-beta.62",
|
|
21
|
+
"@steedos/formula": "3.0.0-beta.62",
|
|
22
|
+
"@steedos/i18n": "3.0.0-beta.62",
|
|
23
|
+
"@steedos/metadata-core": "3.0.0-beta.62",
|
|
24
|
+
"@steedos/metadata-registrar": "3.0.0-beta.62",
|
|
25
|
+
"@steedos/odata-v4-mongodb": "3.0.0-beta.62",
|
|
26
|
+
"@steedos/odata-v4-sql": "3.0.0-beta.62",
|
|
27
|
+
"@steedos/odata-v4-typeorm": "3.0.0-beta.62",
|
|
28
|
+
"@steedos/schemas": "3.0.0-beta.62",
|
|
29
29
|
"amis-formula": "~6.3.0",
|
|
30
30
|
"app-root-path": "^2.2.1",
|
|
31
31
|
"axios": "^0.21.1",
|
|
@@ -63,5 +63,5 @@
|
|
|
63
63
|
"publishConfig": {
|
|
64
64
|
"access": "public"
|
|
65
65
|
},
|
|
66
|
-
"gitHead": "
|
|
66
|
+
"gitHead": "9ad8eb93caa39e1bd9fb80b1292540def6dabd5a"
|
|
67
67
|
}
|