@steedos/objectql 2.7.18-beta.33 → 2.7.18-beta.35

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.
@@ -14,10 +14,10 @@ export declare class MetadataDriver implements SteedosDriver {
14
14
  getMongoOptions(options: any): any;
15
15
  getMongoSortOptions(sort: any): any;
16
16
  getAggregateOptions(options: any): any[];
17
- queryMetadata(collection: any, queryOptions: any, spaceId: any): import("mingo/cursor").Cursor;
17
+ queryMetadata(collection: any, queryOptions: any, spaceId: any): import("mingo/dist/types/cursor").Cursor<unknown>;
18
18
  getSupportedColumnTypes(): SteedosFieldDBType[];
19
- find(collection: any, query: SteedosQueryOptions, spaceId?: SteedosIDType): import("mingo/types").RawArray;
20
- aggregate(collection: any, query: SteedosQueryOptions, externalPipeline: any, spaceId?: SteedosIDType): import("mingo/types").RawArray;
19
+ find(collection: any, query: SteedosQueryOptions, spaceId?: SteedosIDType): unknown[];
20
+ aggregate(collection: any, query: SteedosQueryOptions, externalPipeline: any, spaceId?: SteedosIDType): unknown[];
21
21
  findOne(collection: any, id: SteedosIDType, query: SteedosQueryOptions, spaceId?: SteedosIDType): void;
22
22
  insert(collection: any, doc: Dictionary<any>, spaceId?: SteedosIDType): void;
23
23
  update(collection: any, id: SteedosQueryOptions | SteedosIDType, doc: Dictionary<any>, spaceId?: SteedosIDType): void;
@@ -1,7 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getPrimaryKeys = exports.getEntities = exports.getEntity = exports.getTableColumns = exports.getTableColumnType = void 0;
4
- var tslib_1 = require("tslib");
5
4
  var typeorm_1 = require("typeorm");
6
5
  var driver_1 = require("../driver");
7
6
  function getTableColumnType(field, databaseType) {
@@ -64,9 +63,6 @@ function getTableColumns(fields, object, databaseType) {
64
63
  if (field.column_name) {
65
64
  columns[fieldName]["name"] = field.column_name;
66
65
  }
67
- if (field.primary) {
68
- 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 });
69
- }
70
66
  }
71
67
  if (!primaryColumnCount) {
72
68
  return null;
@@ -1 +1 @@
1
- {"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/typeorm/util.ts"],"names":[],"mappings":"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"}
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": "2.7.18-beta.33",
4
+ "version": "2.7.18-beta.35",
5
5
  "description": "",
6
6
  "main": "lib/index.js",
7
7
  "scripts": {
@@ -16,17 +16,17 @@
16
16
  "dependencies": {
17
17
  "@salesforce/kit": "1.0.4",
18
18
  "@salesforce/ts-types": "1.1.1",
19
- "@steedos/cachers": "2.7.18-beta.33",
20
- "@steedos/filters": "2.7.18-beta.33",
21
- "@steedos/formula": "2.7.18-beta.33",
22
- "@steedos/i18n": "2.7.18-beta.33",
23
- "@steedos/metadata-core": "2.7.18-beta.33",
24
- "@steedos/metadata-registrar": "2.7.18-beta.33",
25
- "@steedos/odata-v4-mongodb": "2.7.18-beta.33",
26
- "@steedos/odata-v4-sql": "2.7.18-beta.33",
27
- "@steedos/odata-v4-typeorm": "2.7.18-beta.33",
28
- "@steedos/schemas": "2.7.18-beta.33",
29
- "@steedos/standard-objects": "2.7.18-beta.33",
19
+ "@steedos/cachers": "2.7.18-beta.35",
20
+ "@steedos/filters": "2.7.18-beta.35",
21
+ "@steedos/formula": "2.7.18-beta.35",
22
+ "@steedos/i18n": "2.7.18-beta.35",
23
+ "@steedos/metadata-core": "2.7.18-beta.35",
24
+ "@steedos/metadata-registrar": "2.7.18-beta.35",
25
+ "@steedos/odata-v4-mongodb": "2.7.18-beta.35",
26
+ "@steedos/odata-v4-sql": "2.7.18-beta.35",
27
+ "@steedos/odata-v4-typeorm": "2.7.18-beta.35",
28
+ "@steedos/schemas": "2.7.18-beta.35",
29
+ "@steedos/standard-objects": "2.7.18-beta.35",
30
30
  "amis-formula": "~6.3.0",
31
31
  "app-root-path": "^2.2.1",
32
32
  "axios": "^0.21.1",
@@ -57,7 +57,7 @@
57
57
  "vm2": "^3.9.17"
58
58
  },
59
59
  "devDependencies": {
60
- "@steedos/meteor-bundle-runner": "2.7.18-beta.33",
60
+ "@steedos/meteor-bundle-runner": "2.7.18-beta.35",
61
61
  "@types/express": "^4.16.1",
62
62
  "@types/node": "^11.10.4",
63
63
  "@types/underscore": "^1.8.13",
@@ -67,5 +67,5 @@
67
67
  "publishConfig": {
68
68
  "access": "public"
69
69
  },
70
- "gitHead": "97ab6a72935b43034b141c262d0e2c9810ae43a5"
70
+ "gitHead": "a1c2f9fc3893ff3ba0d74a278c5f9df992e95c1a"
71
71
  }