myorm_pg 6.2.2 → 7.0.0

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.
Files changed (8) hide show
  1. package/README.md +16 -0
  2. package/lib/implementations/PGDBContext.d.ts +31 -11
  3. package/lib/implementations/PGDBContext.d.ts.map +1 -1
  4. package/lib/implementations/PGDBContext.js +52 -25
  5. package/lib/implementations/PGDBContext.js.map +1 -1
  6. package/lib/implementations/PGDBSet.d.ts +1 -1
  7. package/lib/implementations/PGDBSet.js +2 -2
  8. package/package.json +2 -2
package/README.md CHANGED
@@ -359,6 +359,22 @@ await context.Persons.DeleteAsync(person);
359
359
  ```
360
360
 
361
361
 
362
+ # Inner and Left Join
363
+ We can execute complex join operation
364
+
365
+ ```typescript
366
+ let messagesToCamila = await context.From(Person)
367
+ .InnerJoin(Message)
368
+ .On(Person, "Id", Message, "To")
369
+ .Where(Person,
370
+ {
371
+ Field : "Name",
372
+ Kind : Operation.CONSTAINS,
373
+ Value : "camila"
374
+ })
375
+ .Select(Message).Load("To").ToListAsync();
376
+ ```
377
+
362
378
  # Fluent query methods
363
379
 
364
380
  ## Where
package/lib/implementations/PGDBContext.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import { IStatement, AbstractContext, IJoiningQuery, IJoinSelectable, AbstractSet } from "myorm_core";
2
2
  import PGDBManager from "./PGDBManager";
3
+ import { IJoining } from "myorm_core/lib/objects/interfaces/IDBContext";
3
4
  export default abstract class PGDBContext extends AbstractContext {
4
5
  protected _manager: PGDBManager;
5
6
  private _mappedTypes;
@@ -14,35 +15,48 @@ export default abstract class PGDBContext extends AbstractContext {
14
15
  UpdateDatabaseAsync(): Promise<void>;
15
16
  ExecuteNonQuery(query: string): Promise<void>;
16
17
  ExecuteQuery(query: string): Promise<any>;
17
- Join(...args: (new (...args: any[]) => Object)[]): IJoiningQuery;
18
+ From<T extends Object>(arg: (new (...args: any[]) => T)): IJoiningQuery;
19
+ }
20
+ interface IJoinMap {
21
+ JoiningTable: Function;
22
+ Type: Join;
23
+ Left: Function;
24
+ LeftKey: string;
25
+ Right: Function;
26
+ RightKey: string;
27
+ }
28
+ export declare class Joining implements IJoining {
29
+ private _joiningQuery;
30
+ private _joinType;
31
+ private _joining;
32
+ constructor(joiningQuery: JoiningQuery, join: Join, joinig: Function);
33
+ On<T extends Object, U extends Object>(cT: new (...args: any[]) => T, cKey: keyof T, uT: new (...args: any[]) => U, uKey: keyof U): IJoiningQuery;
18
34
  }
19
35
  export declare class JoiningQuery implements IJoiningQuery {
20
36
  private _context;
21
37
  private _stack;
22
38
  private _onStatements;
23
- constructor(context: PGDBContext, stack: (new (...args: any[]) => Object)[]);
24
- On<C extends Object, U extends Object>(cT: {
25
- new (...args: any[]): C;
26
- }, cKey: keyof C, uT: {
27
- new (...args: any[]): U;
28
- }, uKey: keyof U): IJoiningQuery;
39
+ constructor(context: PGDBContext, arg: (new (...args: any[]) => Object));
40
+ InnerJoin(arg: new (...args: any[]) => Object): IJoining;
41
+ LeftJoin(arg: new (...args: any[]) => Object): IJoining;
42
+ AddOnStatement(on: IJoinMap): void;
29
43
  Where<C extends Object, K extends keyof C>(cT: new (...args: any[]) => C, statement: IStatement<C, K>): IJoiningQuery;
30
44
  And<C extends Object, K extends keyof C>(cT: new (...args: any[]) => C, statement: IStatement<C, K>): IJoiningQuery;
31
45
  Or<C extends Object, K extends keyof C>(cT: new (...args: any[]) => C, statement: IStatement<C, K>): IJoiningQuery;
32
46
  Select<C extends Object>(cT: new (...args: any[]) => C): IJoinSelectable<C>;
33
- private CheckIfTypeIsAllowed;
47
+ CheckIfTypeIsAllowed(cT: new (...args: any[]) => Object): void;
34
48
  }
35
49
  export declare class JoinSelectable<T extends Object> implements IJoinSelectable<T> {
36
50
  private _context;
37
51
  private _stack;
38
52
  private _onStatements;
39
53
  private _type;
40
- constructor(cT: new (...args: any[]) => T, context: PGDBContext, stack: IUnion[], onStack: [string, string][]);
54
+ constructor(cT: new (...args: any[]) => T, context: PGDBContext, stack: IUnion[], onStack: IJoinMap[]);
41
55
  Take(quantity: number): IJoinSelectable<T>;
42
56
  Offset(offset: number): IJoinSelectable<T>;
43
57
  Limit(limit: number): IJoinSelectable<T>;
44
58
  CountAsync(): Promise<number>;
45
- Join<K extends keyof T>(key: K): IJoinSelectable<T>;
59
+ Load<K extends keyof T>(key: K): IJoinSelectable<T>;
46
60
  OrderBy<K extends keyof T>(key: K): IJoinSelectable<T>;
47
61
  OrderDescendingBy<K extends keyof T>(key: K): IJoinSelectable<T>;
48
62
  ToListAsync(): Promise<T[]>;
@@ -51,8 +65,14 @@ export declare class JoinSelectable<T extends Object> implements IJoinSelectable
51
65
  private Reset;
52
66
  }
53
67
  interface IUnion {
54
- Type: unknown;
68
+ Type: Function;
55
69
  Key?: string;
70
+ Join: Join;
71
+ }
72
+ declare enum Join {
73
+ FROM = 0,
74
+ INNER = 1,
75
+ LEFT = 2
56
76
  }
57
77
  export {};
58
78
  //# sourceMappingURL=PGDBContext.d.ts.map
package/lib/implementations/PGDBContext.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"PGDBContext.d.ts","sourceRoot":"","sources":["../../src/implementations/PGDBContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,eAAe,EAAE,aAAa,EAAE,eAAe,EAAU,WAAW,EAAC,MAAM,YAAY,CAAC;AAQ5G,OAAO,WAAW,MAAM,eAAe,CAAC;AAKxC,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,WAAY,SAAQ,eAAe;IAE7D,SAAS,CAAC,QAAQ,EAAE,WAAW,CAAC;IAEhC,OAAO,CAAC,YAAY,CAAuC;gBAE/C,OAAO,EAAG,WAAW;IAO1B,cAAc;IAoBd,QAAQ,CAAC,IAAI,EAAG;QAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,GAAI,OAAO,CAAA;KAAC,GAAI,OAAO;IAK3D,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAI;QAAC,KAAK,GAAG,IAAI,EAAG,GAAG,EAAE,GAAI,CAAC,CAAA;KAAC,GAAG,WAAW,CAAC,CAAC,CAAC;IAgB3E,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAcpC,eAAe,CAAC,KAAK,EAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9C,YAAY,CAAC,KAAK,EAAG,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAKvD,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC,EAAE,GAAG,aAAa;CAOnE;AAED,qBAAa,YAAa,YAAW,aAAa;IAG9C,OAAO,CAAC,QAAQ,CAAe;IAC/B,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,aAAa,CAA2B;gBAGpC,OAAO,EAAG,WAAW,EAAE,KAAK,EAAI,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC,EAAE;IAiB9E,EAAE,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAAE,EAAE,EAAE;QAAE,KAAI,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;KAAE,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE;QAAE,KAAI,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;KAAC,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,aAAa;IAgBlJ,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,aAAa;IAUrH,GAAG,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,aAAa;IAQnH,EAAE,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,aAAa;IAUlH,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,EAAE,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;IAK3E,OAAO,CAAC,oBAAoB;CAa/B;AAGD,qBAAa,cAAc,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,eAAe,CAAC,CAAC,CAAC;IAEvE,OAAO,CAAC,QAAQ,CAAe;IAC/B,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,aAAa,CAA2B;IAChD,OAAO,CAAC,KAAK,CAA6B;gBAC9B,EAAE,EAAG,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,EAAG,OAAO,EAAG,WAAW,EAAE,KAAK,EAAG,MAAM,EAAE,EAAE,OAAO,EAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;IAS3G,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC;IAI1C,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC;IAI1C,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC;IAIlC,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAWnC,IAAI,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;IAKnD,OAAO,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;IAItD,iBAAiB,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;IAK1D,WAAW,IAAI,OAAO,CAAC,CAAC,EAAE,CAAC;IAWxC,SAAS,CAAC,YAAY,IAAI,WAAW,CAAC,CAAC,CAAC;IAsN3B,mBAAmB,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAW1D,OAAO,CAAC,KAAK;CAahB;AAGD,UAAU,MAAM;IAEZ,IAAI,EAAG,OAAO,CAAC;IACf,GAAG,CAAC,EAAI,MAAM,CAAA;CACjB"}
1
+ {"version":3,"file":"PGDBContext.d.ts","sourceRoot":"","sources":["../../src/implementations/PGDBContext.ts"],"names":[],"mappings":"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"}
package/lib/implementations/PGDBContext.js CHANGED
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
12
12
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
- exports.JoinSelectable = exports.JoiningQuery = void 0;
15
+ exports.JoinSelectable = exports.JoiningQuery = exports.Joining = void 0;
16
16
  const myorm_core_1 = require("myorm_core");
17
17
  const SchemasDecorators_1 = __importDefault(require("../core/decorators/SchemasDecorators"));
18
18
  const Type_1 = __importDefault(require("../core/design/Type"));
@@ -71,32 +71,55 @@ class PGDBContext extends myorm_core_1.AbstractContext {
71
71
  return yield this._manager.ExecuteAsync(query);
72
72
  });
73
73
  }
74
- Join(...args) {
75
- return new JoiningQuery(this, args);
74
+ From(arg) {
75
+ return new JoiningQuery(this, arg);
76
76
  }
77
77
  }
78
78
  exports.default = PGDBContext;
79
+ ;
80
+ class Joining {
81
+ constructor(joiningQuery, join, joinig) {
82
+ this._joiningQuery = joiningQuery;
83
+ this._joinType = join;
84
+ this._joining = joinig;
85
+ }
86
+ On(cT, cKey, uT, uKey) {
87
+ this._joiningQuery.CheckIfTypeIsAllowed(cT);
88
+ this._joiningQuery.CheckIfTypeIsAllowed(cT);
89
+ this._joiningQuery.AddOnStatement({
90
+ JoiningTable: this._joining,
91
+ Type: this._joinType,
92
+ Left: cT,
93
+ LeftKey: cKey.toString(),
94
+ Right: uT,
95
+ RightKey: uKey.toString()
96
+ });
97
+ return this._joiningQuery;
98
+ }
99
+ }
100
+ exports.Joining = Joining;
79
101
  class JoiningQuery {
80
- constructor(context, stack) {
102
+ constructor(context, arg) {
81
103
  this._stack = [];
82
104
  this._onStatements = [];
83
105
  this._context = context;
84
- this._stack.push(...stack.map(s => { return { Type: s }; }));
106
+ this._stack.push({ Type: arg, Join: Join.FROM });
85
107
  let notMappedTypes = this._stack.filter(s => this._context.Collection(s.Type) == undefined);
86
108
  if (notMappedTypes.length > 0) {
87
109
  this._stack = [];
88
110
  throw new InvalidOperationException_1.default(`The type ${notMappedTypes[0].Type.name} is not mapped`);
89
111
  }
90
112
  }
91
- On(cT, cKey, uT, uKey) {
92
- this.CheckIfTypeIsAllowed(cT);
93
- this.CheckIfTypeIsAllowed(cT);
94
- let leftIndex = this._stack.findIndex(s => s.Type == cT);
95
- let rightIndex = this._stack.findIndex(s => s.Type == uT);
96
- if (rightIndex - leftIndex != 1)
97
- throw new InvalidOperationException_1.default(`The On statement must follow the same order than Join`);
98
- this._onStatements.push([cKey.toString(), uKey.toString()]);
99
- return this;
113
+ InnerJoin(arg) {
114
+ this._stack.push({ Type: arg, Join: Join.INNER });
115
+ return new Joining(this, Join.INNER, arg);
116
+ }
117
+ LeftJoin(arg) {
118
+ this._stack.push({ Type: arg, Join: Join.LEFT });
119
+ return new Joining(this, Join.LEFT, arg);
120
+ }
121
+ AddOnStatement(on) {
122
+ this._onStatements.push(on);
100
123
  }
101
124
  Where(cT, statement) {
102
125
  this.CheckIfTypeIsAllowed(cT);
@@ -161,9 +184,9 @@ class JoinSelectable {
161
184
  return c;
162
185
  });
163
186
  }
164
- Join(key) {
187
+ Load(key) {
165
188
  var _a;
166
- (_a = this._context.Collection(this._type)) === null || _a === void 0 ? void 0 : _a.Join(key);
189
+ (_a = this._context.Collection(this._type)) === null || _a === void 0 ? void 0 : _a.Load(key);
167
190
  return this;
168
191
  }
169
192
  OrderBy(key) {
@@ -190,21 +213,20 @@ class JoinSelectable {
190
213
  if (this._stack.length < this._onStatements.length + 1)
191
214
  throw new InvalidOperationException_1.default(`There is more On clausules than join types selecteds`);
192
215
  let selectedSideSet = this._context.Collection(this._type);
193
- let leftSideType = this._stack[0].Type;
194
216
  let selectedTable = Type_1.default.GetTableName(this._type);
195
- let query = `select distinct "${selectedTable}".* from "${Type_1.default.GetTableName(leftSideType)}" `;
196
- for (let i = 1; i < this._stack.length; i++) {
197
- let rightSideType = this._stack[i].Type;
217
+ let query = `select distinct "${selectedTable}".* from "${Type_1.default.GetTableName(this._stack[0].Type)}" `;
218
+ for (let i = 0; i < this._onStatements.length; i++) {
219
+ let leftSideType = this._onStatements[i].Left;
220
+ let rightSideType = this._onStatements[i].Right;
198
221
  let leftSideTable = Type_1.default.GetTableName(leftSideType);
199
222
  let rigthSideTable = Type_1.default.GetTableName(rightSideType);
200
- let onStatement = this._onStatements[i - 1];
201
- let leftSideField = onStatement[0];
202
- let rightSideField = onStatement[1];
223
+ let leftSideField = this._onStatements[i].LeftKey;
224
+ let rightSideField = this._onStatements[i].RightKey;
203
225
  let leftSideIsArray = Type_1.default.GetDesingType(leftSideType, leftSideField) == Array;
204
226
  let rightSideIsArray = Type_1.default.GetDesingType(rightSideType, rightSideField) == Array;
205
227
  let rightSideTypeMap = Type_1.default.GetColumnNameAndType(rightSideType);
206
228
  let leftSideTypeMap = Type_1.default.GetColumnNameAndType(leftSideType);
207
- query += ` inner join "${rigthSideTable}" on `;
229
+ query += ` ${this._onStatements[i].Type == Join.LEFT ? 'left' : 'inner'} join "${Type_1.default.GetTableName(this._onStatements[i].JoiningTable)}" on `;
208
230
  let leftSideRelation = SchemasDecorators_1.default.GetRelationAttribute(leftSideType, leftSideField);
209
231
  let rightSideRelation = SchemasDecorators_1.default.GetRelationAttribute(rightSideType, rightSideField);
210
232
  if ((leftSideIsArray && rightSideIsArray) || (!leftSideIsArray && !rightSideIsArray)) {
@@ -304,7 +326,6 @@ class JoinSelectable {
304
326
  query += ` "${leftSideTable}".${leftColumnName} = ANY("${rigthSideTable}".${rightColumnName})`;
305
327
  }
306
328
  }
307
- leftSideType = this._stack[i].Type;
308
329
  }
309
330
  let where = "";
310
331
  for (let type of this._stack) {
@@ -340,4 +361,10 @@ class JoinSelectable {
340
361
  }
341
362
  }
342
363
  exports.JoinSelectable = JoinSelectable;
364
+ var Join;
365
+ (function (Join) {
366
+ Join[Join["FROM"] = 0] = "FROM";
367
+ Join[Join["INNER"] = 1] = "INNER";
368
+ Join[Join["LEFT"] = 2] = "LEFT";
369
+ })(Join || (Join = {}));
343
370
  //# sourceMappingURL=PGDBContext.js.map
package/lib/implementations/PGDBContext.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"PGDBContext.js","sourceRoot":"","sources":["../../src/implementations/PGDBContext.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PGDBContext.js","sourceRoot":"","sources":["../../src/implementations/PGDBContext.ts"],"names":[],"mappings":"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"}
package/lib/implementations/PGDBSet.d.ts CHANGED
@@ -32,7 +32,7 @@ export default class PGDBSet<T extends Object> extends AbstractSet<T> {
32
32
  And<K extends keyof T>(statement: IStatement<T, K>): AbstractSet<T>;
33
33
  Or<K extends keyof T>(statement: IStatement<T, K>): AbstractSet<T>;
34
34
  OrderBy<K extends keyof T>(key: K): AbstractSet<T>;
35
- Join<K extends keyof T>(key: K): AbstractSet<T>;
35
+ Load<K extends keyof T>(key: K): AbstractSet<T>;
36
36
  OrderDescendingBy<K extends keyof T>(key: K): AbstractSet<T>;
37
37
  Limit(limit: number): AbstractSet<T>;
38
38
  Offset(offset: number): AbstractSet<T>;
package/lib/implementations/PGDBSet.js CHANGED
@@ -891,7 +891,7 @@ class PGDBSet extends myorm_core_1.AbstractSet {
891
891
  });
892
892
  return this;
893
893
  }
894
- Join(key) {
894
+ Load(key) {
895
895
  this._includes.push({
896
896
  Field: key
897
897
  });
@@ -1034,7 +1034,7 @@ class PGDBSet extends myorm_core_1.AbstractSet {
1034
1034
  return this;
1035
1035
  }
1036
1036
  LoadRelationOn(field) {
1037
- return this.Join(field);
1037
+ return this.Load(field);
1038
1038
  }
1039
1039
  CreatePromisse(func) {
1040
1040
  return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "myorm_pg",
3
- "version": "6.2.2",
3
+ "version": "7.0.0",
4
4
  "description": "A ORM writen in typescript for postgres",
5
5
  "main": "./lib/Index.js",
6
6
  "types": "./lib/Index.d.ts",
@@ -22,7 +22,7 @@
22
22
  "homepage": "https://github.com/adrianomarino1992/myorm_pg#readme",
23
23
  "license": "ISC",
24
24
  "dependencies": {
25
- "myorm_core": "^4.0.0",
25
+ "myorm_core": "^5.0.0",
26
26
  "pg": "^8.10.0",
27
27
  "reflect-metadata": "^0.1.13"
28
28
  },