@casekit/orm 0.0.1-alpha.6 → 0.0.1-alpha.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.
Files changed (151) hide show
  1. package/lib/migrate/commands/implode.js +1 -1
  2. package/lib/migrate/commands/implode.js.map +1 -1
  3. package/lib/migrate/sql/createTableSql.test.js +1 -0
  4. package/lib/migrate/sql/createTableSql.test.js.map +1 -1
  5. package/lib/orm.d.ts.map +1 -1
  6. package/lib/orm.js +4 -2
  7. package/lib/orm.js.map +1 -1
  8. package/lib/queries/clauses/where/buildWhereClauses.d.ts +1 -1
  9. package/lib/queries/clauses/where/buildWhereClauses.d.ts.map +1 -1
  10. package/lib/queries/clauses/where/buildWhereClauses.js.map +1 -1
  11. package/lib/queries/clauses/where/buildWhereClauses.test.js +1 -1
  12. package/lib/queries/clauses/where/buildWhereClauses.test.js.map +1 -1
  13. package/lib/queries/count/buildCount.d.ts.map +1 -1
  14. package/lib/queries/count/buildCount.js +33 -29
  15. package/lib/queries/count/buildCount.js.map +1 -1
  16. package/lib/queries/count/countToSql.d.ts.map +1 -1
  17. package/lib/queries/count/countToSql.js +12 -17
  18. package/lib/queries/count/countToSql.js.map +1 -1
  19. package/lib/queries/count/types/CountBuilder.d.ts +12 -4
  20. package/lib/queries/count/types/CountBuilder.d.ts.map +1 -1
  21. package/lib/queries/count.d.ts.map +1 -1
  22. package/lib/queries/count.js +3 -1
  23. package/lib/queries/count.js.map +1 -1
  24. package/lib/queries/create/buildCreate.d.ts +1 -1
  25. package/lib/queries/create/buildCreate.d.ts.map +1 -1
  26. package/lib/queries/create/buildCreate.js +1 -1
  27. package/lib/queries/create/buildCreate.js.map +1 -1
  28. package/lib/queries/create/createResultSchema.d.ts.map +1 -1
  29. package/lib/queries/create/createResultSchema.js +3 -1
  30. package/lib/queries/create/createResultSchema.js.map +1 -1
  31. package/lib/queries/create/createToSql.d.ts.map +1 -1
  32. package/lib/queries/create/createToSql.js +2 -2
  33. package/lib/queries/create/createToSql.js.map +1 -1
  34. package/lib/queries/createMany.d.ts.map +1 -1
  35. package/lib/queries/createMany.js +3 -1
  36. package/lib/queries/createMany.js.map +1 -1
  37. package/lib/queries/createOne.d.ts.map +1 -1
  38. package/lib/queries/createOne.js +6 -0
  39. package/lib/queries/createOne.js.map +1 -1
  40. package/lib/queries/delete/buildDelete.d.ts +1 -1
  41. package/lib/queries/delete/buildDelete.d.ts.map +1 -1
  42. package/lib/queries/delete/buildDelete.js +1 -1
  43. package/lib/queries/delete/buildDelete.js.map +1 -1
  44. package/lib/queries/delete/deleteResultSchema.d.ts.map +1 -1
  45. package/lib/queries/delete/deleteResultSchema.js +3 -1
  46. package/lib/queries/delete/deleteResultSchema.js.map +1 -1
  47. package/lib/queries/delete/deleteToSql.js +1 -1
  48. package/lib/queries/delete/deleteToSql.js.map +1 -1
  49. package/lib/queries/deleteMany.d.ts.map +1 -1
  50. package/lib/queries/deleteMany.js +3 -1
  51. package/lib/queries/deleteMany.js.map +1 -1
  52. package/lib/queries/find/buildFind.d.ts.map +1 -1
  53. package/lib/queries/find/buildFind.js +34 -30
  54. package/lib/queries/find/buildFind.js.map +1 -1
  55. package/lib/queries/find/findResultSchema.d.ts.map +1 -1
  56. package/lib/queries/find/findResultSchema.js +9 -2
  57. package/lib/queries/find/findResultSchema.js.map +1 -1
  58. package/lib/queries/find/findToSql.d.ts.map +1 -1
  59. package/lib/queries/find/findToSql.js +12 -17
  60. package/lib/queries/find/findToSql.js.map +1 -1
  61. package/lib/queries/find/tests/findMany.nullable-relations.test.d.ts +2 -0
  62. package/lib/queries/find/tests/findMany.nullable-relations.test.d.ts.map +1 -0
  63. package/lib/queries/find/tests/findMany.nullable-relations.test.js +118 -0
  64. package/lib/queries/find/tests/findMany.nullable-relations.test.js.map +1 -0
  65. package/lib/queries/find/types/FindBuilder.d.ts +12 -4
  66. package/lib/queries/find/types/FindBuilder.d.ts.map +1 -1
  67. package/lib/queries/findMany.d.ts.map +1 -1
  68. package/lib/queries/findMany.js +17 -9
  69. package/lib/queries/findMany.js.map +1 -1
  70. package/lib/queries/update/buildUpdate.d.ts +1 -1
  71. package/lib/queries/update/buildUpdate.d.ts.map +1 -1
  72. package/lib/queries/update/buildUpdate.js +1 -1
  73. package/lib/queries/update/buildUpdate.js.map +1 -1
  74. package/lib/queries/update/updateResultSchema.d.ts.map +1 -1
  75. package/lib/queries/update/updateResultSchema.js +3 -1
  76. package/lib/queries/update/updateResultSchema.js.map +1 -1
  77. package/lib/queries/update/updateToSql.js +1 -1
  78. package/lib/queries/update/updateToSql.js.map +1 -1
  79. package/lib/queries/updateMany.d.ts.map +1 -1
  80. package/lib/queries/updateMany.js +3 -1
  81. package/lib/queries/updateMany.js.map +1 -1
  82. package/lib/queries/util/rowToObject.d.ts.map +1 -1
  83. package/lib/queries/util/rowToObject.js +1 -1
  84. package/lib/queries/util/rowToObject.js.map +1 -1
  85. package/lib/schema/types/base/BaseRelation.d.ts +1 -0
  86. package/lib/schema/types/base/BaseRelation.d.ts.map +1 -1
  87. package/lib/schema/types/loose/LooseRelationDefinition.d.ts +1 -0
  88. package/lib/schema/types/loose/LooseRelationDefinition.d.ts.map +1 -1
  89. package/lib/schema/types/relations/OneToManyRelation.d.ts +1 -0
  90. package/lib/schema/types/relations/OneToManyRelation.d.ts.map +1 -1
  91. package/lib/test/db/index.d.ts +40 -0
  92. package/lib/test/db/index.d.ts.map +1 -1
  93. package/lib/test/db/models/post.model.d.ts +9 -0
  94. package/lib/test/db/models/post.model.d.ts.map +1 -1
  95. package/lib/test/db/models/post.model.js +6 -0
  96. package/lib/test/db/models/post.model.js.map +1 -1
  97. package/lib/test/db/models/post.relations.d.ts +6 -0
  98. package/lib/test/db/models/post.relations.d.ts.map +1 -1
  99. package/lib/test/db/models/post.relations.js +6 -0
  100. package/lib/test/db/models/post.relations.js.map +1 -1
  101. package/lib/test/db/models/user.model.d.ts +9 -0
  102. package/lib/test/db/models/user.model.d.ts.map +1 -1
  103. package/lib/test/db/models/user.model.js +6 -0
  104. package/lib/test/db/models/user.model.js.map +1 -1
  105. package/lib/test/db/models/user.relations.d.ts +16 -0
  106. package/lib/test/db/models/user.relations.d.ts.map +1 -1
  107. package/lib/test/db/models/user.relations.js +16 -0
  108. package/lib/test/db/models/user.relations.js.map +1 -1
  109. package/lib/test/db/models.d.ts +18 -0
  110. package/lib/test/db/models.d.ts.map +1 -1
  111. package/lib/test/db/relations.d.ts +22 -0
  112. package/lib/test/db/relations.d.ts.map +1 -1
  113. package/lib/test/seed/index.d.ts +40 -0
  114. package/lib/test/seed/index.d.ts.map +1 -1
  115. package/package.json +1 -1
  116. package/src/migrate/commands/implode.ts +1 -1
  117. package/src/migrate/sql/createTableSql.test.ts +1 -0
  118. package/src/orm.ts +5 -2
  119. package/src/queries/clauses/where/buildWhereClauses.test.ts +1 -1
  120. package/src/queries/clauses/where/buildWhereClauses.ts +1 -1
  121. package/src/queries/count/buildCount.ts +39 -33
  122. package/src/queries/count/countToSql.ts +27 -32
  123. package/src/queries/count/types/CountBuilder.ts +23 -6
  124. package/src/queries/count.ts +4 -1
  125. package/src/queries/create/buildCreate.ts +2 -2
  126. package/src/queries/create/createResultSchema.ts +3 -1
  127. package/src/queries/create/createToSql.ts +6 -2
  128. package/src/queries/createMany.ts +4 -1
  129. package/src/queries/createOne.ts +9 -0
  130. package/src/queries/delete/buildDelete.ts +2 -2
  131. package/src/queries/delete/deleteResultSchema.ts +3 -1
  132. package/src/queries/delete/deleteToSql.ts +1 -1
  133. package/src/queries/deleteMany.ts +4 -1
  134. package/src/queries/find/buildFind.ts +40 -34
  135. package/src/queries/find/findResultSchema.ts +9 -2
  136. package/src/queries/find/findToSql.ts +27 -32
  137. package/src/queries/find/tests/findMany.nullable-relations.test.ts +127 -0
  138. package/src/queries/find/types/FindBuilder.ts +23 -6
  139. package/src/queries/findMany.ts +25 -17
  140. package/src/queries/update/buildUpdate.ts +2 -2
  141. package/src/queries/update/updateResultSchema.ts +3 -1
  142. package/src/queries/update/updateToSql.ts +1 -1
  143. package/src/queries/updateMany.ts +4 -1
  144. package/src/queries/util/rowToObject.ts +5 -1
  145. package/src/schema/types/base/BaseRelation.ts +1 -0
  146. package/src/schema/types/loose/LooseRelationDefinition.ts +1 -1
  147. package/src/schema/types/relations/OneToManyRelation.ts +1 -0
  148. package/src/test/db/models/post.model.ts +6 -0
  149. package/src/test/db/models/post.relations.ts +6 -0
  150. package/src/test/db/models/user.model.ts +6 -0
  151. package/src/test/db/models/user.relations.ts +16 -0
@@ -21,7 +21,7 @@ export const implode = async (db, { dryRun, output }) => {
21
21
  statement.push(createForeignKeyConstraintSql(model, foreignKey), "\n");
22
22
  }
23
23
  }
24
- if (output)
24
+ if (output || process.env.ORM_VERBOSE_LOGGING)
25
25
  console.log(statement.text);
26
26
  if (!dryRun) {
27
27
  try {
@@ -1 +1 @@
1
- {"version":3,"file":"implode.js","sourceRoot":"","sources":["../../../src/migrate/commands/implode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EACxB,EAAW,EACX,EAAE,MAAM,EAAE,MAAM,EAAwC,EAC1D,EAAE;IACA,MAAM,SAAS,GAAG,IAAI,YAAY,EAAE,CAAC;IAErC,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IACzC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAC3C,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAE9C,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3C,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;QAC5C,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC/C,SAAS,CAAC,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,CAAC;QACvE,CAAC;IACL,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3C,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACzC,SAAS,CAAC,IAAI,CACV,6BAA6B,CAAC,KAAK,EAAE,UAAU,CAAC,EAChD,IAAI,CACP,CAAC;QACN,CAAC;IACL,CAAC;IAED,IAAI,MAAM;QAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAExC,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,IAAI,CAAC;YACD,MAAM,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACf,MAAM,CAAC,CAAC;QACZ,CAAC;IACL,CAAC;AACL,CAAC,CAAC"}
1
+ {"version":3,"file":"implode.js","sourceRoot":"","sources":["../../../src/migrate/commands/implode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EACxB,EAAW,EACX,EAAE,MAAM,EAAE,MAAM,EAAwC,EAC1D,EAAE;IACA,MAAM,SAAS,GAAG,IAAI,YAAY,EAAE,CAAC;IAErC,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IACzC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAC3C,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAE9C,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3C,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;QAC5C,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC/C,SAAS,CAAC,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,CAAC;QACvE,CAAC;IACL,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3C,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACzC,SAAS,CAAC,IAAI,CACV,6BAA6B,CAAC,KAAK,EAAE,UAAU,CAAC,EAChD,IAAI,CACP,CAAC;QACN,CAAC;IACL,CAAC;IAED,IAAI,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB;QAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAE3E,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,IAAI,CAAC;YACD,MAAM,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACf,MAAM,CAAC,CAAC;QACZ,CAAC;IACL,CAAC;AACL,CAAC,CAAC"}
@@ -13,6 +13,7 @@ describe("createTableSql", () => {
13
13
  CREATE TABLE casekit."user" (
14
14
  id uuid NOT NULL DEFAULT uuid_generate_v4(),
15
15
  username text NOT NULL,
16
+ invited_by_id uuid,
16
17
  created_at timestamp,
17
18
  updated_at timestamp,
18
19
  deleted_at timestamp,
@@ -1 +1 @@
1
- {"version":3,"file":"createTableSql.test.js","sourceRoot":"","sources":["../../../src/migrate/sql/createTableSql.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAmB,GAAG,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC5B,IAAI,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAA;;;;;;;;;SAS3D,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACjC,MAAM,IAAI,GAAG;YACT,KAAK;YACL,OAAO,EAAE;gBACL,EAAE,EAAE;oBACA,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE;oBAC5B,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,GAAG,CAAA,oBAAoB;iBACnC;gBACD,KAAK,EAAE;oBACH,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;oBACrB,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,eAAe;iBAC3B;gBACD,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;gBAChD,WAAW,EAAE;oBACT,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE;oBACnB,IAAI,EAAE,WAAW;oBACjB,QAAQ,EAAE,IAAI;iBACjB;aACJ;SAC+B,CAAC;QACrC,MAAM,GAAG,CAAC;YACN,MAAM,EAAE,EAAE,IAAI,EAAE;YAChB,SAAS,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YACvB,MAAM,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE;YAC7B,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE;SACtB,CAAC,CAAC,QAAQ,CACP,KAAK,EAAE,EAAE,EAAE,EAAE;YACT,MAAM,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YAE1D,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,KAAK,CACpC,GAAG,CAAA,yBAAyB,CAAC,eAAe,CAAC,KAAK,CAAC,CACtD,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC7C,IAAI;gBACJ,OAAO;gBACP,SAAS;gBACT,cAAc;aACjB,CAAC,CAAC;QACP,CAAC,EACD,EAAE,QAAQ,EAAE,IAAI,EAAE,CACrB,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"createTableSql.test.js","sourceRoot":"","sources":["../../../src/migrate/sql/createTableSql.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAmB,GAAG,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC5B,IAAI,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAA;;;;;;;;;;SAU3D,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACjC,MAAM,IAAI,GAAG;YACT,KAAK;YACL,OAAO,EAAE;gBACL,EAAE,EAAE;oBACA,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE;oBAC5B,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,GAAG,CAAA,oBAAoB;iBACnC;gBACD,KAAK,EAAE;oBACH,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;oBACrB,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,eAAe;iBAC3B;gBACD,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;gBAChD,WAAW,EAAE;oBACT,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE;oBACnB,IAAI,EAAE,WAAW;oBACjB,QAAQ,EAAE,IAAI;iBACjB;aACJ;SAC+B,CAAC;QACrC,MAAM,GAAG,CAAC;YACN,MAAM,EAAE,EAAE,IAAI,EAAE;YAChB,SAAS,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YACvB,MAAM,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE;YAC7B,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE;SACtB,CAAC,CAAC,QAAQ,CACP,KAAK,EAAE,EAAE,EAAE,EAAE;YACT,MAAM,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YAE1D,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,KAAK,CACpC,GAAG,CAAA,yBAAyB,CAAC,eAAe,CAAC,KAAK,CAAC,CACtD,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC7C,IAAI;gBACJ,OAAO;gBACP,SAAS;gBACT,cAAc;aACjB,CAAC,CAAC;QACP,CAAC,EACD,EAAE,QAAQ,EAAE,IAAI,EAAE,CACrB,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
package/lib/orm.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"orm.d.ts","sourceRoot":"","sources":["../src/orm.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"orm.d.ts","sourceRoot":"","sources":["../src/orm.ts"],"names":[],"mappings":"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"}
package/lib/orm.js CHANGED
@@ -119,7 +119,7 @@ export class Orm {
119
119
  }
120
120
  async query(fragments, ...variables) {
121
121
  const query = sql(fragments, ...variables);
122
- if (!process.env.CI) {
122
+ if (process.env.ORM_VERBOSE_LOGGING) {
123
123
  console.log(query.text);
124
124
  console.log(query.values);
125
125
  }
@@ -128,8 +128,10 @@ export class Orm {
128
128
  }
129
129
  async queryOne(fragments, ...variables) {
130
130
  const query = sql(fragments, ...variables);
131
- if (!process.env.CI)
131
+ if (process.env.ORM_VERBOSE_LOGGING) {
132
132
  console.log(query.text);
133
+ console.log(query.values);
134
+ }
133
135
  const result = await this.connection.query(query);
134
136
  if (result.rowCount === 0 || result.rowCount === null)
135
137
  throw new OrmError("No rows returned from query");
package/lib/orm.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"orm.js","sourceRoot":"","sources":["../src/orm.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"orm.js","sourceRoot":"","sources":["../src/orm.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,7 @@ import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDef
4
4
  import { SQLStatement } from "../../../sql";
5
5
  import { WhereClause } from "../WhereClause";
6
6
  export declare const buildWhereClauses: (config: BaseConfiguration, table: {
7
- name: string;
7
+ table: string;
8
8
  schema: string;
9
9
  alias: string;
10
10
  model: string;
@@ -1 +1 @@
1
- {"version":3,"file":"buildWhereClauses.d.ts","sourceRoot":"","sources":["../../../../src/queries/clauses/where/buildWhereClauses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAO,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAI7C,eAAO,MAAM,iBAAiB,WAClB,iBAAiB,SAClB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,SAC9D,YAAY,qBAAqB,EAAE,UAAU,qBAAqB,CAAC,CAAC,KAC5E,YAgCF,CAAC"}
1
+ {"version":3,"file":"buildWhereClauses.d.ts","sourceRoot":"","sources":["../../../../src/queries/clauses/where/buildWhereClauses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAO,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAI7C,eAAO,MAAM,iBAAiB,WAClB,iBAAiB,SAClB;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,SAC/D,YAAY,qBAAqB,EAAE,UAAU,qBAAqB,CAAC,CAAC,KAC5E,YAgCF,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"buildWhereClauses.js","sourceRoot":"","sources":["../../../../src/queries/clauses/where/buildWhereClauses.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgB,GAAG,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC7B,MAAyB,EACzB,KAAqE,EACrE,KAA2E,EAC/D,EAAE;IACd,MAAM,OAAO,GAAmB,EAAE,CAAC;IACnC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE;QAC9C,OAAO,CAAC,IAAI,CACR,gBAAgB,CACZ,KAAK,CAAC,KAAK,EACX,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,EACrD,KAAK,CACR,CACJ,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACd,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;YAC7C,OAAO,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,CAAA,IAAI,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACb,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;YAC5C,OAAO,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,CAAA,IAAI,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACd,MAAM,UAAU,GAAG,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QACjE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAA,OAAO,UAAU,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,GAAG,CAAA,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC;AACjD,CAAC,CAAC"}
1
+ {"version":3,"file":"buildWhereClauses.js","sourceRoot":"","sources":["../../../../src/queries/clauses/where/buildWhereClauses.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgB,GAAG,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC7B,MAAyB,EACzB,KAAsE,EACtE,KAA2E,EAC/D,EAAE;IACd,MAAM,OAAO,GAAmB,EAAE,CAAC;IACnC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE;QAC9C,OAAO,CAAC,IAAI,CACR,gBAAgB,CACZ,KAAK,CAAC,KAAK,EACX,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,EACrD,KAAK,CACR,CACJ,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACd,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;YAC7C,OAAO,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,CAAA,IAAI,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACb,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;YAC5C,OAAO,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,CAAA,IAAI,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACd,MAAM,UAAU,GAAG,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QACjE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAA,OAAO,UAAU,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,GAAG,CAAA,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC;AACjD,CAAC,CAAC"}
@@ -104,7 +104,7 @@ describe("buildWhereClauses", () => {
104
104
  [1, 2, 3],
105
105
  ],
106
106
  ])("Where clause of %s returns SQL %s with variables %s", (where, sql, values) => {
107
- const clause = buildWhereClauses(db.config, { name: "foo", schema: "casekit", model: "foo", alias: "a" }, where);
107
+ const clause = buildWhereClauses(db.config, { table: "foo", schema: "casekit", model: "foo", alias: "a" }, where);
108
108
  expect(clause.text).toEqual(sql);
109
109
  expect(clause.values).toEqual(values);
110
110
  });
@@ -1 +1 @@
1
- {"version":3,"file":"buildWhereClauses.test.js","sourceRoot":"","sources":["../../../../src/queries/clauses/where/buildWhereClauses.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"buildWhereClauses.test.js","sourceRoot":"","sources":["../../../../src/queries/clauses/where/buildWhereClauses.test.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"buildCount.d.ts","sourceRoot":"","sources":["../../../src/queries/count/buildCount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAI5E,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,eAAO,MAAM,UAAU,WACX,iBAAiB,KACtB,MAAM,SACF,eAAe,SAChB,MAAM,EAAE,2BAEf,YAyDF,CAAC"}
1
+ {"version":3,"file":"buildCount.d.ts","sourceRoot":"","sources":["../../../src/queries/count/buildCount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAI5E,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,eAAO,MAAM,UAAU,WACX,iBAAiB,KACtB,MAAM,SACF,eAAe,SAChB,MAAM,EAAE,2BAEf,YA+DF,CAAC"}
@@ -2,43 +2,47 @@ import { ensureArray } from "../../util/ensureArray";
2
2
  import { tableAlias } from "../util/tableAlias";
3
3
  export const buildCount = (config, m, query, path = [], _tableIndex = 0) => {
4
4
  const builder = {
5
+ table: {
6
+ table: config.models[m]["table"],
7
+ model: m,
8
+ schema: config.models[m]["schema"],
9
+ alias: tableAlias(_tableIndex++),
10
+ joins: [],
11
+ where: config.middleware.count?.where
12
+ ? config.middleware.count.where(query.where, {
13
+ config,
14
+ model: m,
15
+ })
16
+ : query.where,
17
+ },
5
18
  tableIndex: _tableIndex,
6
- tables: [],
7
19
  };
8
20
  const model = config.models[m];
9
- const alias = tableAlias(builder.tableIndex++);
10
- builder.tables.push({
11
- name: config.models[m]["table"],
12
- model: m,
13
- schema: config.models[m]["schema"],
14
- alias: alias,
15
- where: config.middleware.count?.where
16
- ? config.middleware.count.where(query.where, { config, model: m })
17
- : query.where,
18
- });
21
+ const alias = builder.table.alias;
19
22
  for (const [r, subquery] of Object.entries(query.include ?? {})) {
20
23
  const relation = config.relations[m][r];
21
24
  const joinedModel = config.models[relation.model];
22
25
  if (relation.type === "N:1") {
23
26
  const joinBuilder = buildCount(config, relation.model, subquery, [...path, r], builder.tableIndex++);
24
- const [joinedTable, ...otherTables] = joinBuilder.tables;
25
- builder.tables.push({
26
- ...joinedTable,
27
- joins: [
28
- ...(joinedTable.joins ?? []),
29
- {
30
- from: {
31
- table: alias,
32
- columns: ensureArray(relation.foreignKey).map((c) => model.columns[c].name),
33
- },
34
- to: {
35
- table: joinedTable.alias,
36
- columns: joinedModel.primaryKey.map((c) => joinedModel.columns[c].name),
37
- },
38
- },
39
- ],
40
- });
41
- builder.tables.push(...otherTables);
27
+ const joinedTable = joinBuilder.table;
28
+ builder.table.joins.push({
29
+ from: {
30
+ schema: config.models[m].schema,
31
+ table: config.models[m].table,
32
+ alias,
33
+ model: m,
34
+ columns: ensureArray(relation.foreignKey).map((c) => model.columns[c].name),
35
+ },
36
+ to: {
37
+ schema: joinedModel.schema,
38
+ table: joinedTable.table,
39
+ alias: joinedTable.alias,
40
+ model: relation.model,
41
+ columns: joinedModel.primaryKey.map((c) => joinedModel.columns[c].name),
42
+ },
43
+ where: joinedTable.where,
44
+ type: relation.optional ? "left" : "inner",
45
+ }, ...joinedTable.joins);
42
46
  }
43
47
  }
44
48
  return builder;
@@ -1 +1 @@
1
- {"version":3,"file":"buildCount.js","sourceRoot":"","sources":["../../../src/queries/count/buildCount.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAIhD,MAAM,CAAC,MAAM,UAAU,GAAG,CACtB,MAAyB,EACzB,CAAS,EACT,KAAsB,EACtB,OAAiB,EAAE,EACnB,WAAW,GAAG,CAAC,EACH,EAAE;IACd,MAAM,OAAO,GAAiB;QAC1B,UAAU,EAAE,WAAW;QACvB,MAAM,EAAE,EAAE;KACb,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAE/B,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IAE/C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QAC/B,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QAClC,KAAK,EAAE,KAAK;QACZ,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK;YACjC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;YAClE,CAAC,CAAC,KAAK,CAAC,KAAK;KACpB,CAAC,CAAC;IAEH,KAAK,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;QAC9D,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACxC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClD,IAAI,QAAQ,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAC1B,MAAM,WAAW,GAAG,UAAU,CAC1B,MAAM,EACN,QAAQ,CAAC,KAAK,EACd,QAAS,EACT,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,EACZ,OAAO,CAAC,UAAU,EAAE,CACvB,CAAC;YACF,MAAM,CAAC,WAAW,EAAE,GAAG,WAAW,CAAC,GAAG,WAAW,CAAC,MAAM,CAAC;YACzD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;gBAChB,GAAG,WAAW;gBACd,KAAK,EAAE;oBACH,GAAG,CAAC,WAAW,CAAC,KAAK,IAAI,EAAE,CAAC;oBAC5B;wBACI,IAAI,EAAE;4BACF,KAAK,EAAE,KAAK;4BACZ,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,GAAG,CACzC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAC/B;yBACJ;wBACD,EAAE,EAAE;4BACA,KAAK,EAAE,WAAW,CAAC,KAAK;4BACxB,OAAO,EAAE,WAAW,CAAC,UAAU,CAAC,GAAG,CAC/B,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CACrC;yBACJ;qBACJ;iBACJ;aACJ,CAAC,CAAC;YACH,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;QACxC,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC"}
1
+ {"version":3,"file":"buildCount.js","sourceRoot":"","sources":["../../../src/queries/count/buildCount.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAIhD,MAAM,CAAC,MAAM,UAAU,GAAG,CACtB,MAAyB,EACzB,CAAS,EACT,KAAsB,EACtB,OAAiB,EAAE,EACnB,WAAW,GAAG,CAAC,EACH,EAAE;IACd,MAAM,OAAO,GAAiB;QAC1B,KAAK,EAAE;YACH,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAChC,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;YAClC,KAAK,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC;YAChC,KAAK,EAAE,EAAE;YACT,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK;gBACjC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE;oBACvC,MAAM;oBACN,KAAK,EAAE,CAAC;iBACX,CAAC;gBACJ,CAAC,CAAC,KAAK,CAAC,KAAK;SACpB;QACD,UAAU,EAAE,WAAW;KAC1B,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAE/B,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;IAElC,KAAK,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;QAC9D,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACxC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClD,IAAI,QAAQ,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAC1B,MAAM,WAAW,GAAG,UAAU,CAC1B,MAAM,EACN,QAAQ,CAAC,KAAK,EACd,QAAS,EACT,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,EACZ,OAAO,CAAC,UAAU,EAAE,CACvB,CAAC;YACF,MAAM,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC;YACtC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CACpB;gBACI,IAAI,EAAE;oBACF,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM;oBAC/B,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK;oBAC7B,KAAK;oBACL,KAAK,EAAE,CAAC;oBACR,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,GAAG,CACzC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAC/B;iBACJ;gBACD,EAAE,EAAE;oBACA,MAAM,EAAE,WAAW,CAAC,MAAM;oBAC1B,KAAK,EAAE,WAAW,CAAC,KAAK;oBACxB,KAAK,EAAE,WAAW,CAAC,KAAK;oBACxB,KAAK,EAAE,QAAQ,CAAC,KAAK;oBACrB,OAAO,EAAE,WAAW,CAAC,UAAU,CAAC,GAAG,CAC/B,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CACrC;iBACJ;gBACD,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO;aAC7C,EACD,GAAG,WAAW,CAAC,KAAK,CACvB,CAAC;QACN,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"countToSql.d.ts","sourceRoot":"","sources":["../../../src/queries/count/countToSql.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAO,MAAM,WAAW,CAAC;AAG9C,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,eAAO,MAAM,UAAU,WACX,iBAAiB,WAChB,YAAY,KACtB,YA0DF,CAAC"}
1
+ {"version":3,"file":"countToSql.d.ts","sourceRoot":"","sources":["../../../src/queries/count/countToSql.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAO,MAAM,WAAW,CAAC;AAG9C,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,eAAO,MAAM,UAAU,WACX,iBAAiB,WAChB,YAAY,KACtB,YAqDF,CAAC"}
@@ -4,25 +4,20 @@ import { sql } from "../../sql";
4
4
  import { buildWhereClauses } from "../clauses/where/buildWhereClauses";
5
5
  import { hasConditions } from "../util/hasConditions";
6
6
  export const countToSql = (config, builder) => {
7
- const [table, ...joinedTables] = builder.tables;
7
+ const table = builder.table;
8
8
  const frag = sql `SELECT count(1) as "count"`;
9
- frag.push(pgfmt(`\nFROM %I.%I %I`, table.schema, table.name, table.alias));
10
- for (const joinedTable of joinedTables) {
11
- if (!joinedTable.joins)
12
- throw new OrmError("Joined table without join clauses", {
13
- data: builder,
14
- });
15
- frag.push(pgfmt("\nJOIN %I.%I %I\n ON ", joinedTable.schema, joinedTable.name, joinedTable.alias));
16
- frag.push(joinedTable.joins
17
- .flatMap((join) => {
18
- if (join.from.columns.length !== join.to.columns.length) {
19
- throw new OrmError("Number of foreign keys doesn't match number of primary keys in join", { data: builder });
20
- }
21
- return join.from.columns.map((from, i) => pgfmt("%I.%I = %I.%I", table.alias, from, joinedTable.alias, join.to.columns[i]));
22
- })
9
+ frag.push(pgfmt(`\nFROM %I.%I %I`, table.schema, table.table, table.alias));
10
+ for (const join of table.joins ?? []) {
11
+ if (join.from.columns.length !== join.to.columns.length) {
12
+ throw new OrmError("Number of foreign keys doesn't match number of primary keys in join", { data: builder });
13
+ }
14
+ frag.push(join.type === "left" ? "\nLEFT JOIN" : "\nJOIN");
15
+ frag.push(pgfmt("\n %I.%I %I\n ON ", join.to.schema, join.to.table, join.to.alias));
16
+ frag.push(join.from.columns
17
+ .map((from, i) => pgfmt("%I.%I = %I.%I", join.from.alias, from, join.to.alias, join.to.columns[i]))
23
18
  .join(" AND "));
24
- if (hasConditions(joinedTable.where)) {
25
- frag.push(sql `\n AND ${buildWhereClauses(config, joinedTable, joinedTable.where)}`);
19
+ if (hasConditions(join.where)) {
20
+ frag.push(sql `\n AND ${buildWhereClauses(config, join.to, join.where)}`);
26
21
  }
27
22
  }
28
23
  frag.push(sql `\nWHERE 1 = 1`);
@@ -1 +1 @@
1
- {"version":3,"file":"countToSql.js","sourceRoot":"","sources":["../../../src/queries/count/countToSql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,WAAW,CAAC;AAE9B,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EAAgB,GAAG,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAGtD,MAAM,CAAC,MAAM,UAAU,GAAG,CACtB,MAAyB,EACzB,OAAqB,EACT,EAAE;IACd,MAAM,CAAC,KAAK,EAAE,GAAG,YAAY,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAEhD,MAAM,IAAI,GAAG,GAAG,CAAA,4BAA4B,CAAC;IAE7C,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAE3E,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,CAAC,KAAK;YAClB,MAAM,IAAI,QAAQ,CAAC,mCAAmC,EAAE;gBACpD,IAAI,EAAE,OAAO;aAChB,CAAC,CAAC;QACP,IAAI,CAAC,IAAI,CACL,KAAK,CACD,0BAA0B,EAC1B,WAAW,CAAC,MAAM,EAClB,WAAW,CAAC,IAAI,EAChB,WAAW,CAAC,KAAK,CACpB,CACJ,CAAC;QACF,IAAI,CAAC,IAAI,CACL,WAAW,CAAC,KAAK;aACZ,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACd,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;gBACtD,MAAM,IAAI,QAAQ,CACd,qEAAqE,EACrE,EAAE,IAAI,EAAE,OAAO,EAAE,CACpB,CAAC;YACN,CAAC;YAED,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CACrC,KAAK,CACD,eAAe,EACf,KAAK,CAAC,KAAK,EACX,IAAI,EACJ,WAAW,CAAC,KAAK,EACjB,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CACrB,CACJ,CAAC;QACN,CAAC,CAAC;aACD,IAAI,CAAC,OAAO,CAAC,CACrB,CAAC;QACF,IAAI,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,IAAI,CACL,GAAG,CAAA,aAAa,iBAAiB,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,KAAK,CAAC,EAAE,CAC9E,CAAC;QACN,CAAC;IACL,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA,eAAe,CAAC,CAAC;IAE9B,IAAI,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,IAAI,CAAC,IAAI,CACL,GAAG,CAAA,aAAa,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,CAClE,CAAC;IACN,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC"}
1
+ {"version":3,"file":"countToSql.js","sourceRoot":"","sources":["../../../src/queries/count/countToSql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,WAAW,CAAC;AAE9B,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EAAgB,GAAG,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAGtD,MAAM,CAAC,MAAM,UAAU,GAAG,CACtB,MAAyB,EACzB,OAAqB,EACT,EAAE;IACd,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAE5B,MAAM,IAAI,GAAG,GAAG,CAAA,4BAA4B,CAAC;IAE7C,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAE5E,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC;QACnC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACtD,MAAM,IAAI,QAAQ,CACd,qEAAqE,EACrE,EAAE,IAAI,EAAE,OAAO,EAAE,CACpB,CAAC;QACN,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,CACL,KAAK,CACD,sBAAsB,EACtB,IAAI,CAAC,EAAE,CAAC,MAAM,EACd,IAAI,CAAC,EAAE,CAAC,KAAK,EACb,IAAI,CAAC,EAAE,CAAC,KAAK,CAChB,CACJ,CAAC;QACF,IAAI,CAAC,IAAI,CACL,IAAI,CAAC,IAAI,CAAC,OAAO;aACZ,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CACb,KAAK,CACD,eAAe,EACf,IAAI,CAAC,IAAI,CAAC,KAAK,EACf,IAAI,EACJ,IAAI,CAAC,EAAE,CAAC,KAAK,EACb,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CACrB,CACJ;aACA,IAAI,CAAC,OAAO,CAAC,CACrB,CAAC;QACF,IAAI,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC,IAAI,CACL,GAAG,CAAA,aAAa,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CACnE,CAAC;QACN,CAAC;IACL,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA,eAAe,CAAC,CAAC;IAE9B,IAAI,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,IAAI,CAAC,IAAI,CACL,GAAG,CAAA,aAAa,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,CAClE,CAAC;IACN,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC"}
@@ -3,24 +3,32 @@ import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDef
3
3
  import { WhereClause } from "../../clauses/WhereClause";
4
4
  export type CountBuilder = {
5
5
  tableIndex: number;
6
- tables: {
7
- name: string;
6
+ table: {
7
+ table: string;
8
8
  model: string;
9
9
  schema: string;
10
10
  alias: string;
11
- joins?: Join[];
11
+ joins: Join[];
12
12
  conditions?: WhereClause<LooseModelDefinitions, ModelName<LooseModelDefinitions>>;
13
13
  where?: WhereClause<LooseModelDefinitions, ModelName<LooseModelDefinitions>>;
14
- }[];
14
+ };
15
15
  };
16
16
  export type Join = {
17
17
  from: {
18
+ schema: string;
18
19
  table: string;
20
+ alias: string;
21
+ model: string;
19
22
  columns: string[];
20
23
  };
21
24
  to: {
25
+ schema: string;
22
26
  table: string;
27
+ alias: string;
28
+ model: string;
23
29
  columns: string[];
24
30
  };
31
+ where?: WhereClause<LooseModelDefinitions, ModelName<LooseModelDefinitions>>;
32
+ type?: "inner" | "left";
25
33
  };
26
34
  //# sourceMappingURL=CountBuilder.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"CountBuilder.d.ts","sourceRoot":"","sources":["../../../../src/queries/count/types/CountBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,MAAM,MAAM,YAAY,GAAG;IACvB,UAAU,EAAE,MAAM,CAAC;IAEnB,MAAM,EAAE;QACJ,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;QACf,UAAU,CAAC,EAAE,WAAW,CACpB,qBAAqB,EACrB,SAAS,CAAC,qBAAqB,CAAC,CACnC,CAAC;QACF,KAAK,CAAC,EAAE,WAAW,CACf,qBAAqB,EACrB,SAAS,CAAC,qBAAqB,CAAC,CACnC,CAAC;KACL,EAAE,CAAC;CACP,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACf,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC3C,EAAE,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;CAC5C,CAAC"}
1
+ {"version":3,"file":"CountBuilder.d.ts","sourceRoot":"","sources":["../../../../src/queries/count/types/CountBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,MAAM,MAAM,YAAY,GAAG;IACvB,UAAU,EAAE,MAAM,CAAC;IAEnB,KAAK,EAAE;QACH,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,IAAI,EAAE,CAAC;QACd,UAAU,CAAC,EAAE,WAAW,CACpB,qBAAqB,EACrB,SAAS,CAAC,qBAAqB,CAAC,CACnC,CAAC;QACF,KAAK,CAAC,EAAE,WAAW,CACf,qBAAqB,EACrB,SAAS,CAAC,qBAAqB,CAAC,CACnC,CAAC;KACL,CAAC;CACL,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACf,IAAI,EAAE;QACF,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IACF,EAAE,EAAE;QACA,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IACF,KAAK,CAAC,EAAE,WAAW,CACf,qBAAqB,EACrB,SAAS,CAAC,qBAAqB,CAAC,CACnC,CAAC;IACF,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAC3B,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../../src/queries/count.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,eAAO,MAAM,KAAK,SACR,UAAU,UACR,iBAAiB,KACtB,MAAM,SACF,eAAe,iBAiBzB,CAAC"}
1
+ {"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../../src/queries/count.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,eAAO,MAAM,KAAK,SACR,UAAU,UACR,iBAAiB,KACtB,MAAM,SACF,eAAe,iBAoBzB,CAAC"}
@@ -9,8 +9,10 @@ export const count = async (conn, config, m, query) => {
9
9
  sql: statement.text,
10
10
  values: statement.values,
11
11
  });
12
- if (!process.env.CI)
12
+ if (process.env.ORM_VERBOSE_LOGGING) {
13
13
  console.log(statement.text);
14
+ console.log(statement.values);
15
+ }
14
16
  const result = await conn
15
17
  .query(statement)
16
18
  .then((result) => result.rows[0].count);
@@ -1 +1 @@
1
- {"version":3,"file":"count.js","sourceRoot":"","sources":["../../src/queries/count.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,EACtB,IAAgB,EAChB,MAAyB,EACzB,CAAS,EACT,KAAsB,EACxB,EAAE;IACA,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAC7C,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9C,MAAM,CAAC,IAAI,CAAC;QACR,OAAO,EAAE,iBAAiB;QAC1B,GAAG,EAAE,SAAS,CAAC,IAAI;QACnB,MAAM,EAAE,SAAS,CAAC,MAAM;KAC3B,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAEjD,MAAM,MAAM,GAAG,MAAM,IAAI;SACpB,KAAK,CAAC,SAAS,CAAC;SAChB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAE5C,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC"}
1
+ {"version":3,"file":"count.js","sourceRoot":"","sources":["../../src/queries/count.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,EACtB,IAAgB,EAChB,MAAyB,EACzB,CAAS,EACT,KAAsB,EACxB,EAAE;IACA,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAC7C,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9C,MAAM,CAAC,IAAI,CAAC;QACR,OAAO,EAAE,iBAAiB;QAC1B,GAAG,EAAE,SAAS,CAAC,IAAI;QACnB,MAAM,EAAE,SAAS,CAAC,MAAM;KAC3B,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC5B,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAI;SACpB,KAAK,CAAC,SAAS,CAAC;SAChB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAE5C,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC"}
@@ -3,7 +3,7 @@ import { BaseCreateManyParams } from "./types/BaseCreateManyParams";
3
3
  export type CreateBuilder = {
4
4
  tableIndex: number;
5
5
  table: {
6
- name: string;
6
+ table: string;
7
7
  schema: string;
8
8
  };
9
9
  params: {
@@ -1 +1 @@
1
- {"version":3,"file":"buildCreate.d.ts","sourceRoot":"","sources":["../../../src/queries/create/buildCreate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAI5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,MAAM,MAAM,aAAa,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACxC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,OAAO,EAAE,CAAA;KAAE,EAAE,CAAC;IAC5D,UAAU,CAAC,EAAE;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE,CAAC;IAC/B,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC9D,CAAC;AAEF,eAAO,MAAM,WAAW,WACZ,iBAAiB,KACtB,MAAM,UACD,oBAAoB,2BAE7B,aA6CF,CAAC"}
1
+ {"version":3,"file":"buildCreate.d.ts","sourceRoot":"","sources":["../../../src/queries/create/buildCreate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAI5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,MAAM,MAAM,aAAa,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,OAAO,EAAE,CAAA;KAAE,EAAE,CAAC;IAC5D,UAAU,CAAC,EAAE;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE,CAAC;IAC/B,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC9D,CAAC;AAEF,eAAO,MAAM,WAAW,WACZ,iBAAiB,KACtB,MAAM,UACD,oBAAoB,2BAE7B,aA6CF,CAAC"}
@@ -4,7 +4,7 @@ export const buildCreate = (config, m, params, _tableIndex = 0) => {
4
4
  const builder = {
5
5
  tableIndex: _tableIndex,
6
6
  table: {
7
- name: config.models[m].table,
7
+ table: config.models[m].table,
8
8
  schema: config.models[m].schema,
9
9
  },
10
10
  params: [],
@@ -1 +1 @@
1
- {"version":3,"file":"buildCreate.js","sourceRoot":"","sources":["../../../src/queries/create/buildCreate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAWhD,MAAM,CAAC,MAAM,WAAW,GAAG,CACvB,MAAyB,EACzB,CAAS,EACT,MAA4B,EAC5B,WAAW,GAAG,CAAC,EACF,EAAE;IACf,MAAM,OAAO,GAAkB;QAC3B,UAAU,EAAE,WAAW;QACvB,KAAK,EAAE;YACH,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK;YAC5B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM;SAClC;QACD,MAAM,EAAE,EAAE;QACV,SAAS,EAAE,EAAE;KAChB,CAAC;IAEF,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IAC/C,IAAI,QAAQ,GAAG,CAAC,CAAC;IAEjB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACnC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM;QAC5B,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QAC1D,CAAC,CAAC,CAAC,CACV,CAAC;IAEF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QACnB,MAAM,IAAI,QAAQ,CAAC,uCAAuC,EAAE;YACxD,IAAI,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE;SACtB,CAAC,CAAC;IAEP,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YAChB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAC9B,IAAI,EAAE,CAAC;YACP,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAClC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC;QACrC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAC9B,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,GAAG,KAAK,IAAI,QAAQ,EAAE,EAAE;SAClC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IAEvC,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC"}
1
+ {"version":3,"file":"buildCreate.js","sourceRoot":"","sources":["../../../src/queries/create/buildCreate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAWhD,MAAM,CAAC,MAAM,WAAW,GAAG,CACvB,MAAyB,EACzB,CAAS,EACT,MAA4B,EAC5B,WAAW,GAAG,CAAC,EACF,EAAE;IACf,MAAM,OAAO,GAAkB;QAC3B,UAAU,EAAE,WAAW;QACvB,KAAK,EAAE;YACH,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK;YAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM;SAClC;QACD,MAAM,EAAE,EAAE;QACV,SAAS,EAAE,EAAE;KAChB,CAAC;IAEF,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IAC/C,IAAI,QAAQ,GAAG,CAAC,CAAC;IAEjB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACnC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM;QAC5B,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QAC1D,CAAC,CAAC,CAAC,CACV,CAAC;IAEF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QACnB,MAAM,IAAI,QAAQ,CAAC,uCAAuC,EAAE;YACxD,IAAI,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE;SACtB,CAAC,CAAC;IAEP,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YAChB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAC9B,IAAI,EAAE,CAAC;YACP,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAClC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC;QACrC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAC9B,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,GAAG,KAAK,IAAI,QAAQ,EAAE,EAAE;SAClC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IAEvC,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"createResultSchema.d.ts","sourceRoot":"","sources":["../../../src/queries/create/createResultSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAEnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,eAAO,MAAM,kBAAkB,WACnB,iBAAiB,KACtB,MAAM,UACD,oBAAoB,GAAG,mBAAmB;;;;EAYrD,CAAC"}
1
+ {"version":3,"file":"createResultSchema.d.ts","sourceRoot":"","sources":["../../../src/queries/create/createResultSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAEnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,eAAO,MAAM,kBAAkB,WACnB,iBAAiB,KACtB,MAAM,UACD,oBAAoB,GAAG,mBAAmB;;;;EAcrD,CAAC"}
@@ -5,7 +5,9 @@ export const createResultSchema = (config, m, params) => {
5
5
  const obj = {};
6
6
  params.returning?.forEach((s) => {
7
7
  const col = config.models[m].columns[s];
8
- obj[s] = col.nullable ? col.zodSchema.nullable() : col.zodSchema;
8
+ obj[s] = col.nullable
9
+ ? col.zodSchema.nullish().transform((x) => x ?? null)
10
+ : col.zodSchema;
9
11
  });
10
12
  return z.object(obj);
11
13
  };
@@ -1 +1 @@
1
- {"version":3,"file":"createResultSchema.js","sourceRoot":"","sources":["../../../src/queries/create/createResultSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,CAAC,EAAE,MAAM,KAAK,CAAC;AAKnC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAC9B,MAAyB,EACzB,CAAS,EACT,MAAkD,EACpD,EAAE;IACA,IAAI,CAAC,MAAM,CAAC,SAAS;QAAE,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;IAEzC,MAAM,GAAG,GAAuC,EAAE,CAAC;IAEnD,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5B,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACxC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC,CAAC"}
1
+ {"version":3,"file":"createResultSchema.js","sourceRoot":"","sources":["../../../src/queries/create/createResultSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,CAAC,EAAE,MAAM,KAAK,CAAC;AAKnC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAC9B,MAAyB,EACzB,CAAS,EACT,MAAkD,EACpD,EAAE;IACA,IAAI,CAAC,MAAM,CAAC,SAAS;QAAE,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;IAEzC,MAAM,GAAG,GAAuC,EAAE,CAAC;IAEnD,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5B,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACxC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,QAAQ;YACjB,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;YACrD,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"createToSql.d.ts","sourceRoot":"","sources":["../../../src/queries/create/createToSql.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAO,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,eAAO,MAAM,WAAW,YAAa,aAAa,KAAG,YAkCpD,CAAC"}
1
+ {"version":3,"file":"createToSql.d.ts","sourceRoot":"","sources":["../../../src/queries/create/createToSql.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAO,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,eAAO,MAAM,WAAW,YAAa,aAAa,KAAG,YAsCpD,CAAC"}
@@ -4,10 +4,10 @@ export const createToSql = (builder) => {
4
4
  const frag = new SQLStatement();
5
5
  const { table, params, returning } = builder;
6
6
  if (params.length === 0) {
7
- frag.push(pgfmt("INSERT INTO %I.%I DEFAULT VALUES", table.schema, table.name));
7
+ frag.push(pgfmt("INSERT INTO %I.%I DEFAULT VALUES", table.schema, table.table));
8
8
  }
9
9
  else {
10
- frag.push(pgfmt("INSERT INTO %I.%I (\n", table.schema, table.name));
10
+ frag.push(pgfmt("INSERT INTO %I.%I (\n", table.schema, table.table));
11
11
  frag.push(params.map((p) => pgfmt(" %I", p.name)).join(",\n"));
12
12
  frag.push(") VALUES ");
13
13
  const values = params[0].values.map((_, index) => {
@@ -1 +1 @@
1
- {"version":3,"file":"createToSql.js","sourceRoot":"","sources":["../../../src/queries/create/createToSql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,WAAW,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAG9C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,OAAsB,EAAgB,EAAE;IAChE,MAAM,IAAI,GAAG,IAAI,YAAY,EAAE,CAAC;IAEhC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAE7C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,IAAI,CAAC,IAAI,CACL,KAAK,CAAC,kCAAkC,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CACtE,CAAC;IACN,CAAC;SAAM,CAAC;QACJ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QACpE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACvB,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YAC7C,OAAO,GAAG,CAAA,MAAM,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;QACrE,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,OAAO,CAAC,UAAU,EAAE,EAAE,KAAK,SAAS,EAAE,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC1B,IAAI,CAAC,IAAI,CACL,SAAS;aACJ,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;aAClD,IAAI,CAAC,KAAK,CAAC,CACnB,CAAC;IACN,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAEjB,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC"}
1
+ {"version":3,"file":"createToSql.js","sourceRoot":"","sources":["../../../src/queries/create/createToSql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,WAAW,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAG9C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,OAAsB,EAAgB,EAAE;IAChE,MAAM,IAAI,GAAG,IAAI,YAAY,EAAE,CAAC;IAEhC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAE7C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,IAAI,CAAC,IAAI,CACL,KAAK,CACD,kCAAkC,EAClC,KAAK,CAAC,MAAM,EACZ,KAAK,CAAC,KAAK,CACd,CACJ,CAAC;IACN,CAAC;SAAM,CAAC;QACJ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACvB,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YAC7C,OAAO,GAAG,CAAA,MAAM,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;QACrE,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,OAAO,CAAC,UAAU,EAAE,EAAE,KAAK,SAAS,EAAE,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC1B,IAAI,CAAC,IAAI,CACL,SAAS;aACJ,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;aAClD,IAAI,CAAC,KAAK,CAAC,CACnB,CAAC;IACN,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAEjB,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"createMany.d.ts","sourceRoot":"","sources":["../../src/queries/createMany.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAG3E,eAAO,MAAM,UAAU,SACb,UAAU,UACR,iBAAiB,KACtB,MAAM,UACD,oBAAoB,uDAqB/B,CAAC"}
1
+ {"version":3,"file":"createMany.d.ts","sourceRoot":"","sources":["../../src/queries/createMany.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAG3E,eAAO,MAAM,UAAU,SACb,UAAU,UACR,iBAAiB,KACtB,MAAM,UACD,oBAAoB,uDAwB/B,CAAC"}
@@ -13,8 +13,10 @@ export const createMany = async (conn, config, m, params) => {
13
13
  sql: statement.text,
14
14
  values: statement.values,
15
15
  });
16
- if (!process.env.CI)
16
+ if (process.env.ORM_VERBOSE_LOGGING) {
17
17
  console.log(statement.text);
18
+ console.log(statement.values);
19
+ }
18
20
  const result = await conn.query(statement);
19
21
  return params.returning
20
22
  ? result.rows.map(rowToObject(builder.returning))
@@ -1 +1 @@
1
- {"version":3,"file":"createMany.js","sourceRoot":"","sources":["../../src/queries/createMany.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAC3B,IAAgB,EAChB,MAAyB,EACzB,CAAS,EACT,MAA4B,EAC9B,EAAE;IACA,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAEvC,MAAM,CAAC,IAAI,CAAC;QACR,OAAO,EAAE,kBAAkB;QAC3B,GAAG,EAAE,SAAS,CAAC,IAAI;QACnB,MAAM,EAAE,SAAS,CAAC,MAAM;KAC3B,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAEjD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC3C,OAAO,MAAM,CAAC,SAAS;QACnB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;AAC1B,CAAC,CAAC"}
1
+ {"version":3,"file":"createMany.js","sourceRoot":"","sources":["../../src/queries/createMany.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAC3B,IAAgB,EAChB,MAAyB,EACzB,CAAS,EACT,MAA4B,EAC9B,EAAE;IACA,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAEvC,MAAM,CAAC,IAAI,CAAC;QACR,OAAO,EAAE,kBAAkB;QAC3B,GAAG,EAAE,SAAS,CAAC,IAAI;QACnB,MAAM,EAAE,SAAS,CAAC,MAAM;KAC3B,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC5B,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC3C,OAAO,MAAM,CAAC,SAAS;QACnB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;AAC1B,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"createOne.d.ts","sourceRoot":"","sources":["../../src/queries/createOne.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAGzE,eAAO,MAAM,SAAS,SACZ,UAAU,UACR,iBAAiB,KACtB,MAAM,UACD,mBAAmB,qDAO9B,CAAC"}
1
+ {"version":3,"file":"createOne.d.ts","sourceRoot":"","sources":["../../src/queries/createOne.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAG5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAGzE,eAAO,MAAM,SAAS,SACZ,UAAU,UACR,iBAAiB,KACtB,MAAM,UACD,mBAAmB,qDAe9B,CAAC"}
@@ -1,5 +1,11 @@
1
+ import { OrmError } from "..";
1
2
  import { createMany } from "./createMany";
2
3
  export const createOne = async (conn, config, m, params) => {
4
+ if (params.onConflict?.do === "nothing" && params.returning) {
5
+ throw new OrmError("Cannot use 'returning' with 'onConflict' in createOne", {
6
+ data: { m, params },
7
+ });
8
+ }
3
9
  const result = await createMany(conn, config, m, {
4
10
  ...params,
5
11
  values: [params.values],
@@ -1 +1 @@
1
- {"version":3,"file":"createOne.js","sourceRoot":"","sources":["../../src/queries/createOne.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAC1B,IAAgB,EAChB,MAAyB,EACzB,CAAS,EACT,MAA2B,EAC7B,EAAE;IACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE;QAC7C,GAAG,MAAM;QACT,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;KAC1B,CAAC,CAAC;IACH,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AACtD,CAAC,CAAC"}
1
+ {"version":3,"file":"createOne.js","sourceRoot":"","sources":["../../src/queries/createOne.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAG9B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAC1B,IAAgB,EAChB,MAAyB,EACzB,CAAS,EACT,MAA2B,EAC7B,EAAE;IACA,IAAI,MAAM,CAAC,UAAU,EAAE,EAAE,KAAK,SAAS,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QAC1D,MAAM,IAAI,QAAQ,CACd,uDAAuD,EACvD;YACI,IAAI,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE;SACtB,CACJ,CAAC;IACN,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE;QAC7C,GAAG,MAAM;QACT,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;KAC1B,CAAC,CAAC;IACH,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AACtD,CAAC,CAAC"}
@@ -6,7 +6,7 @@ import { BaseDeleteParams } from "./types/BaseDeleteParams";
6
6
  export type DeleteBuilder = {
7
7
  tableIndex: number;
8
8
  table: {
9
- name: string;
9
+ table: string;
10
10
  model: string;
11
11
  alias: string;
12
12
  schema: string;
@@ -1 +1 @@
1
- {"version":3,"file":"buildDelete.d.ts","sourceRoot":"","sources":["../../../src/queries/delete/buildDelete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAG5E,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,MAAM,aAAa,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACtE,KAAK,EAAE,WAAW,CAAC,qBAAqB,EAAE,SAAS,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAC5E,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC9D,CAAC;AAEF,eAAO,MAAM,WAAW,WACZ,iBAAiB,KACtB,MAAM,UACD,gBAAgB,2BAEzB,aAkCF,CAAC"}
1
+ {"version":3,"file":"buildDelete.d.ts","sourceRoot":"","sources":["../../../src/queries/delete/buildDelete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAG5E,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,MAAM,aAAa,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACvE,KAAK,EAAE,WAAW,CAAC,qBAAqB,EAAE,SAAS,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAC5E,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC9D,CAAC;AAEF,eAAO,MAAM,WAAW,WACZ,iBAAiB,KACtB,MAAM,UACD,gBAAgB,2BAEzB,aAkCF,CAAC"}
@@ -4,7 +4,7 @@ export const buildDelete = (config, m, params, _tableIndex = 0) => {
4
4
  const builder = {
5
5
  tableIndex: _tableIndex,
6
6
  table: {
7
- name: config.models[m].table,
7
+ table: config.models[m].table,
8
8
  schema: config.models[m].schema,
9
9
  model: m,
10
10
  alias: tableAlias(_tableIndex++),