npm - @entity-access/entity-access - Versions diffs - 1.0.225 → 1.0.227 - Mend

@entity-access/entity-access 1.0.225 → 1.0.227

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 (32) hide show

package/dist/drivers/sql-server/ExpressionToSqlServer.js +1 -1
package/dist/drivers/sql-server/ExpressionToSqlServer.js.map +1 -1
package/dist/model/EntityQuery.d.ts.map +1 -1
package/dist/model/EntityQuery.js +29 -4
package/dist/model/EntityQuery.js.map +1 -1
package/dist/model/changes/ChangeEntry.d.ts +1 -0
package/dist/model/changes/ChangeEntry.d.ts.map +1 -1
package/dist/model/changes/ChangeEntry.js +17 -2
package/dist/model/changes/ChangeEntry.js.map +1 -1
package/dist/model/changes/ChangeSet.js +2 -2
package/dist/model/changes/ChangeSet.js.map +1 -1
package/dist/query/ast/ExpressionToSql.js +2 -2
package/dist/query/ast/ExpressionToSql.js.map +1 -1
package/dist/tests/db-tests/tests/update-items.d.ts.map +1 -1
package/dist/tests/db-tests/tests/update-items.js +5 -2
package/dist/tests/db-tests/tests/update-items.js.map +1 -1
package/dist/tests/expressions/left-joins/child-joins.d.ts.map +1 -1
package/dist/tests/expressions/left-joins/child-joins.js +22 -5
package/dist/tests/expressions/left-joins/child-joins.js.map +1 -1
package/dist/tests/expressions/trimInternal.d.ts.map +1 -1
package/dist/tests/expressions/trimInternal.js +8 -6
package/dist/tests/expressions/trimInternal.js.map +1 -1
package/dist/tsconfig.tsbuildinfo +1 -1
package/package.json +1 -1
package/src/drivers/sql-server/ExpressionToSqlServer.ts +1 -1
package/src/model/EntityQuery.ts +35 -4
package/src/model/changes/ChangeEntry.ts +18 -2
package/src/model/changes/ChangeSet.ts +2 -2
package/src/query/ast/ExpressionToSql.ts +2 -2
package/src/tests/db-tests/tests/update-items.ts +6 -2
package/src/tests/expressions/left-joins/child-joins.ts +22 -5
package/src/tests/expressions/trimInternal.ts +8 -6

package/dist/drivers/sql-server/ExpressionToSqlServer.js CHANGED Viewed

@@ -143,7 +143,7 @@ export default class ExpressionToSqlServer extends ExpressionToSql {
                 default:
                     throw new Error(`${s.type} Not supported`);
             }
-            return prepare `UPDATE ${top} ${this.visit(e.source)} SET
+            return prepare `UPDATE ${top} ${this.visit(e.sourceParameter)} SET
             ${fields}
             FROM ${source}${as}${joins}${where}${orderBy}${offset}${next}`;
         }

package/dist/drivers/sql-server/ExpressionToSqlServer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ExpressionToSqlServer.js","sourceRoot":"","sources":["../../../src/drivers/sql-server/ExpressionToSqlServer.ts"],"names":[],"mappings":"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~~MAAM~~,CAAC;~~cAClD~~,MAAM;mBACD,MAAM,GAAG,EAAE,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI,EAAE,CAAC;QACnE,CAAC;QACD,OAAO,OAAO,CAAC,UAAU,GAAG;UAC1B,MAAM;eACD,MAAM,GAAG,EAAE,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI,EAAE,CAAC;IACnE,CAAC;IAED,oBAAoB,CAAC,CAAkB;QACnC,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,KAAK,MAAM,SAAS,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;YAC/B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAK,IAAI,CAAC,UAAU,CAAC,SAAS,CAAE,GAAG,CAAC,CAAC;QAC3D,CAAC;QACD,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/E,OAAO,OAAO,CAAC,WAAW,IAAI,KAAK,MAAM,EAAE,CAAC;IAEhD,CAAC;IAED,mBAAmB,CAAC,EAAE,KAAK,EAAkB;QACzC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAE,KAAK,CAAC,CAAC;IACvC,CAAC;CACJ"}
1	+ {"version":3,"file":"ExpressionToSqlServer.js","sourceRoot":"","sources":["../../../src/drivers/sql-server/ExpressionToSqlServer.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAmC,aAAa,EAAE,iBAAiB,EAAmD,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACrL,OAAO,EAAc,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAEzF,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,eAAe;IAE9D,kBAAkB,CAAC,CAAgB;QAC/B,IAAI,CAAC,CAAC,EAAE,CAAC;YACL,OAAO,EAAE,CAAC;QACd,CAAC;QACD,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,EAAE,CAAC;QACd,CAAC;QACD,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,KAAK,MAAM,QAAQ,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;YAC9B,IAAI,CAAC,EAAE,EAAE,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAChE,CAAC;QACD,OAAO,OAAO,CAAC,WAAW,MAAM,EAAE,CAAC;IACvC,CAAC;IAED,oBAAoB,CAAC,CAAkB;QACnC,MAAM,YAAY,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtE,IAAI,CAAC,CAAC,MAAM,YAAY,eAAe,EAAE,CAAC;YAEtC,MAAM,IAAI,GAAG,EAAE,CAAC;YAChB,KAAK,MAAM,QAAQ,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACrC,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;gBACtC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACnB,SAAS;gBACb,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAK,GAAI,GAAG,CAAC,CAAC;YACpC,CAAC;YAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACpB,OAAO,OAAO,CAAC,eAAe,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,YAAY,EAAE,CAAC;YACxE,CAAC;YAED,OAAO,OAAO,CAAC,eAAe,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,YAAY,WAAW,IAAI,EAAE,CAAC;QAC7H,CAAC;QACD,OAAO,OAAO,CAAC,eAAe,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,YAAY,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;IAEhG,CAAC;IAED,oBAAoB,CAAC,CAAkB;QACnC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAElC,MAAM,aAAa,GAAG,EAAE,CAAC;QACzB,MAAM,YAAY,GAAG,EAAE,CAAC;QACxB,MAAM,SAAS,GAAG,EAAE,CAAC;QAErB,MAAM,OAAO,GAAG,EAAE,CAAC;QAEnB,MAAM,IAAI,GAAG,EAAE,CAAC;QAEhB,KAAK,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;YACrC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC3B,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC5B,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACtB,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC;QAED,KAAK,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;YACrC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC3B,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC5B,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC1C,CAAC;QAED,KAAK,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;YACnC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC3B,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC5B,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACpC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;QAED,MAAM,YAAY,GAAG,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAExE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YAEpB,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC;gBAElB,MAAM,MAAM,GAAG,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBAEhE,OAAO,OAAO,CAAC;6BACF,WAAW,CAAC,MAAM,CAAC,SAAS,KAAK;4BAClC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC;;;sCAGnB,KAAK,KAAK,WAAW,CAAC,aAAa,CAAC;0BAChD,YAAY;iDACW,WAAW,CAAC,YAAY,CAAC,WAAW,WAAW,CAAC,aAAa,CAAC;0DACrD,KAAK,UAAU,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC;;iBAErF,CAAC;YACN,CAAC;YACD,OAAO,OAAO,CAAC,WAAW,WAAW,CAAC,IAAI,CAAC,SAAS,KAAK;wBAC7C,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC;;;kCAGnB,KAAK,KAAK,WAAW,CAAC,aAAa,CAAC;6CACzB,WAAW,CAAC,YAAY,CAAC,WAAW,WAAW,CAAC,aAAa,CAAC;sDACrD,KAAK,UAAU,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC;qBAC7E,CAAC;QAClB,CAAC;QAEG,OAAO,OAAO,CAAC;qBACF,KAAK;;kBAER,WAAW,CAAC,SAAS,CAAC;kBACtB,YAAY;oBACV,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC;;;8BAGnB,KAAK,KAAK,WAAW,CAAC,aAAa,CAAC;kBAChD,YAAY;yCACW,WAAW,CAAC,YAAY,CAAC,WAAW,WAAW,CAAC,aAAa,CAAC;kDACrD,KAAK,UAAU,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC;iBAC7E,CAAC;IACd,CAAC;IAGD,oBAAoB,CAAC,CAAkB;QAEnC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;QAEzB,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpG,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAExE,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACpD,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAE3F,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;QACrC,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,MAAM,CAAC;QAEtC,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;YACtB,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;gBACrB,6CAA6C;gBAC7C,+CAA+C;gBAC/C,CAAC,CAAC,OAAO,GAAG;oBACR,iBAAiB,CAAC,MAAM,CAAC,EAAG,MAAM,EAAG,aAAa,CAAC,GAAG,EAAG,CAAC;iBAC7D,CAAC;YACN,CAAC;QACL,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACjC,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,GAAG,EAAE,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAE/D,IAAI,MAAkB,CAAC;QACvB,IAAI,EAAmB,CAAC;QACxB,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;YACtC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAyB,CAAC;YACtC,MAAM,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACpE,MAAM,GAAI,OAAO,CAAC,WAAW,IAAI,QAAQ,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;YACvG,EAAE,GAAG,EAAE,CAAC;QACZ,CAAC;aAAM,CAAC;YACJ,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YAC9B,EAAE,GAAG,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjF,CAAC;QAED,4DAA4D;QAC5D,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;QACvF,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5F,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;YACpB,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;YACnB,QAAO,CAAC,CAAC,IAAI,EAAE,CAAC;gBACZ,KAAK,YAAY,CAAC;gBAClB,KAAK,cAAc;oBACf,MAAM;gBACV;oBACI,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,gBAAgB,CAAC,CAAC;YACnD,CAAC;YACD,OAAO,OAAO,CAAC,UAAU,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC;cAC3D,MAAM;mBACD,MAAM,GAAG,EAAE,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI,EAAE,CAAC;QACnE,CAAC;QACD,OAAO,OAAO,CAAC,UAAU,GAAG;UAC1B,MAAM;eACD,MAAM,GAAG,EAAE,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI,EAAE,CAAC;IACnE,CAAC;IAED,oBAAoB,CAAC,CAAkB;QACnC,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,KAAK,MAAM,SAAS,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;YAC/B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAK,IAAI,CAAC,UAAU,CAAC,SAAS,CAAE,GAAG,CAAC,CAAC;QAC3D,CAAC;QACD,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/E,OAAO,OAAO,CAAC,WAAW,IAAI,KAAK,MAAM,EAAE,CAAC;IAEhD,CAAC;IAED,mBAAmB,CAAC,EAAE,KAAK,EAAkB;QACzC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAE,KAAK,CAAC,CAAC;IACvC,CAAC;CACJ"}

package/dist/model/EntityQuery.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"EntityQuery.d.ts","sourceRoot":"","sources":["../../src/model/EntityQuery.ts"],"names":[],"mappings":";AACA,OAAO,MAAM,MAAM,qBAAqB,CAAC;AAIzC,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,~~EAAkJ~~,eAAe,EAAgB,MAAM,6BAA6B,CAAC;~~AAG5N~~,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAE/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9E,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAE1D,MAAM,CAAC,OAAO,OAAO,WAAW,CAAC,CAAC,GAAG,GAAG,CACpC,YAAW,mBAAmB,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;IAE3C,OAAO,EAAE,aAAa,CAAC;IACvB,IAAI,EAAE,UAAU,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,QAAQ,EAAE,GAAG,EAAE,CAAC;gBACV,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAOzC,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAI5B,UAAU,CAAC,EAAE,EAAE,YAAY;IA0B3B,GAAG,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAwBlC,UAAU,CAAC,MAAM,EAAE,WAAW,GAAG,GAAG;IAIpC,MAAM,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAGrC,gBAAgB,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG;IAIzC,KAAK,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,GAAG;IAQ7D,OAAO,CAAC,CAAC,EAAE,GAAG,GAAG,GAAG;IAQd,MAAM,CAAC,CAAC,KAAA,EAAE,CAAC,KAAA,GAAG,OAAO,CAAC,MAAM,CAAC;~~IAoC7B~~,OAAO,IAAI,OAAO,CAAC,CAAC,EAAE,CAAC;IAQtB,SAAS,IAAI,cAAc,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC;IAkD7C,IAAI,CAAC,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW;IAuBlG,WAAW,IAAI,OAAO,CAAC,CAAC,CAAC;IAOzB,KAAK,IAAI,OAAO,CAAC,CAAC,CAAC;IAMzB,OAAO,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,GAAG,EAAE,CAAC;KAAE;IAG3C,OAAO,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAQtC,iBAAiB,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAUhD,KAAK,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,GAAG;IAI9C,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG;IAIrB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG;IAIhB,GAAG,CAAC,UAAU,CAAC,EAAC,GAAG,EAAE,EAAE,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAuC/C,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC;IAsCxB,KAAK,CAAC,UAAU,CAAC,EAAC,GAAG,EAAE,EAAE,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAwCvD,OAAO,CAAC,MAAM;CASjB"}
1	+ {"version":3,"file":"EntityQuery.d.ts","sourceRoot":"","sources":["../../src/model/EntityQuery.ts"],"names":[],"mappings":"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"}

package/dist/model/EntityQuery.js CHANGED Viewed

@@ -2,7 +2,7 @@ import { __addDisposableResource, __disposeResources } from "tslib";
 import EntityAccessError from "../common/EntityAccessError.js";
 import Logger from "../common/Logger.js";
 import { AsyncDisposableScope } from "../common/usingAsync.js";
-import { CallExpression, Expression, ExpressionAs, Identifier, InsertStatement, NumberLiteral, OrderByExpression } from "../query/ast/Expressions.js";
+import { CallExpression, ExistsExpression, Expression, ExpressionAs, Identifier, InsertStatement, NumberLiteral, OrderByExpression } from "../query/ast/Expressions.js";
 import { QueryExpander } from "../query/expander/QueryExpander.js";
 import RelationMapper from "./identity/RelationMapper.js";
 export default class EntityQuery {
@@ -84,7 +84,15 @@ export default class EntityQuery {
         });
     }
     async update(p, f) {
-        const q = this.extend(p, f, (select, body) => {
+        let updateQuery = new EntityQuery({ ...this, selectStatement: {
+                ...this.selectStatement,
+                sourceParameter: {
+                    ...this.selectStatement.sourceParameter
+                },
+                where: null,
+                joins: null
+            } });
+        updateQuery = updateQuery.extend(p, f, (select, body) => {
             const fields = [];
             switch (body.type) {
                 case "NewObjectExpression":
@@ -100,11 +108,28 @@ export default class EntityQuery {
             }
             return { ...select, fields };
         });
-        q.selectStatement.updateStatement = true;
+        // q.selectStatement.updateStatement = true;
+        updateQuery.selectStatement.updateStatement = true;
+        const lm = updateQuery.selectStatement.sourceParameter;
+        const rm = this.selectStatement.sourceParameter;
+        let where = this.selectStatement.where ? { ...this.selectStatement.where } : null;
+        for (const iterator of this.type.keys) {
+            const compare = Expression.equal(Expression.member(lm, Expression.quotedIdentifier(iterator.columnName)), Expression.member(rm, Expression.quotedIdentifier(iterator.columnName)));
+            where = where ? Expression.logicalAnd(where, compare) : compare;
+        }
+        const fields = [NumberLiteral.one];
+        const target = {
+            ...this.selectStatement,
+            fields,
+            where,
+        };
+        updateQuery.selectStatement.where = ExistsExpression.create({
+            target
+        });
         const session = this.context.logger?.newSession() ?? Logger.nullLogger;
         let query;
         try {
-            query = this.context.driver.compiler.compileExpression(q, q.selectStatement);
+            query = this.context.driver.compiler.compileExpression(updateQuery, updateQuery.selectStatement);
             this.traceQuery?.(query.text);
             const r = await this.context.connection.executeQuery(query);
             return r.updated;

package/dist/model/EntityQuery.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"EntityQuery.js","sourceRoot":"","sources":["../../src/model/EntityQuery.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"EntityQuery.js","sourceRoot":"","sources":["../../src/model/EntityQuery.ts"],"names":[],"mappings":"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"}

package/dist/model/changes/ChangeEntry.d.ts CHANGED Viewed

@@ -38,6 +38,7 @@ export default class ChangeEntry<T = any> implements IChanges {
      */
     isUpdated(field: keyof T): boolean;
     detect(): void;
+    updateValues(dbValues: any): this;
     apply(dbValues: any): void;
     clearUpdated(): void;
     /**

package/dist/model/changes/ChangeEntry.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ChangeEntry.d.ts","sourceRoot":"","sources":["../../../src/model/changes/ChangeEntry.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,UAAU,MAAM,kCAAkC,CAAC;AAC1D,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAG5C,MAAM,WAAW,QAAQ;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,GAAG,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,GAAG,CAAC;IACd,MAAM,EAAE,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,SAAS,GAAG,WAAW,CAAC;CACvF;AAED,MAAM,WAAW,OAAO;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,GAAG,CAAC;IACd,QAAQ,EAAE,GAAG,CAAC;CACjB;AAED,MAAM,CAAC,OAAO,OAAO,WAAW,CAAC,CAAC,GAAG,GAAG,CAAE,YAAW,QAAQ;IAEzD,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,CAAC,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,GAAG,CAAC;IACd,MAAM,EAAE,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,SAAS,GAAG,WAAW,CAAC;IAEpF,QAAQ,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE/B,SAAS,EAAE,SAAS,CAAC;IAErB,OAAO,CAAC,OAAO,CAAiB;IAEhC,OAAO,CAAC,UAAU,CAAmB;gBAEzB,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS;IAU7C;;;;OAIG;IACI,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC;IAKhC;;;;OAIG;IACI,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;IAKxB,MAAM;IAkEN,KAAK,CAAC,QAAQ,KAAA;~~IA0Cd~~,YAAY;IAInB;;OAEG;IACI,MAAM;IAeb,kBAAkB;~~IAuDlB~~,sBAAsB;CA0BzB"}
1	+ {"version":3,"file":"ChangeEntry.d.ts","sourceRoot":"","sources":["../../../src/model/changes/ChangeEntry.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,UAAU,MAAM,kCAAkC,CAAC;AAC1D,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAG5C,MAAM,WAAW,QAAQ;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,GAAG,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,GAAG,CAAC;IACd,MAAM,EAAE,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,SAAS,GAAG,WAAW,CAAC;CACvF;AAED,MAAM,WAAW,OAAO;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,GAAG,CAAC;IACd,QAAQ,EAAE,GAAG,CAAC;CACjB;AAED,MAAM,CAAC,OAAO,OAAO,WAAW,CAAC,CAAC,GAAG,GAAG,CAAE,YAAW,QAAQ;IAEzD,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,CAAC,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,GAAG,CAAC;IACd,MAAM,EAAE,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,SAAS,GAAG,WAAW,CAAC;IAEpF,QAAQ,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE/B,SAAS,EAAE,SAAS,CAAC;IAErB,OAAO,CAAC,OAAO,CAAiB;IAEhC,OAAO,CAAC,UAAU,CAAmB;gBAEzB,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS;IAU7C;;;;OAIG;IACI,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC;IAKhC;;;;OAIG;IACI,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;IAKxB,MAAM;IAkEN,YAAY,CAAC,QAAQ,KAAA;IAYrB,KAAK,CAAC,QAAQ,KAAA;IA2Cd,YAAY;IAInB;;OAEG;IACI,MAAM;IAeb,kBAAkB;IA0DlB,sBAAsB;CA0BzB"}

package/dist/model/changes/ChangeEntry.js CHANGED Viewed

@@ -84,6 +84,17 @@ export default class ChangeEntry {
             this.status = "unchanged";
         }
     }
+    updateValues(dbValues) {
+        if (!dbValues) {
+            return this;
+        }
+        const { entity, type } = this;
+        for (const iterator of type.columns) {
+            const dbValue = dbValues[iterator.name];
+            entity[iterator.name] = dbValue;
+        }
+        return this;
+    }
     apply(dbValues) {
         // apply values to main entity
         // set status to unchanged
@@ -97,10 +108,11 @@ export default class ChangeEntry {
         }
         // we will only apply the columns defined
         if (dbValues !== void 0) {
-            for (const iterator of this.type.columns) {
+            const { entity, type } = this;
+            for (const iterator of type.columns) {
                 const dbValue = dbValues[iterator.columnName];
                 if (dbValue !== void 0) {
-                    this.entity[iterator.name] = dbValues[iterator.columnName];
+                    entity[iterator.name] = dbValue;
                 }
             }
         }
@@ -180,6 +192,9 @@ export default class ChangeEntry {
                 }
                 continue;
             }
+            if (!relatedChanges.dependents.has(this)) {
+                relatedChanges.dependents.add(this);
+            }
             this.entity[iterator.fkColumn.name] = related[rKey.name];
         }
     }

package/dist/model/changes/ChangeEntry.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ChangeEntry.js","sourceRoot":"","sources":["../../../src/model/changes/ChangeEntry.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,mCAAmC,CAAC;AAIlE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAgBpD,MAAM,CAAC,OAAO,OAAO,WAAW;IAiB5B,YAAY,CAAW,EAAE,SAAoB;QACzC,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;QAChD,MAAM,EAAE,GAAG,CAAgB,CAAC;QAC5B,EAAE,CAAC,SAAS,GAAG,SAAS,CAAC;QACzB,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC;QAChB,EAAE,CAAC,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;QAC1B,EAAE,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;QACxB,OAAO,EAAE,CAAC;IACd,CAAC;IAED;;;;OAIG;IACI,UAAU,CAAC,KAAc;QAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAe,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC;IAC/C,CAAC;IAED;;;;OAIG;IACI,SAAS,CAAC,KAAc;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAe,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC;IAC9C,CAAC;IAEM,MAAM;QAET,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC5B,OAAO;QACX,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACjD,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAExB,IAAI,QAAQ,KAAK,KAAK,CAAC,EAAE,CAAC;YAEtB,sCAAsC;YAEtC,IAAI,OAAO,GAAG,IAAI,CAAC;YACnB,IAAI,YAAY,GAAG,KAAK,CAAC;YACzB,KAAK,MAAM,QAAQ,IAAI,IAAI,EAAE,CAAC;gBAC1B,YAAY,KAAK,QAAQ,CAAC,SAA+B,CAAC;gBAC1D,IAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;oBAClC,OAAO,GAAG,KAAK,CAAC;gBACpB,CAAC;YACL,CAAC;YAED,IAAI,OAAO,EAAE,CAAC;gBACV,IAAI,CAAC,YAAY,EAAE,CAAC;oBAChB,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC;oBACzB,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBAC1B,OAAO;gBACX,CAAC;YACL,CAAC;iBAAM,IAAI,YAAY,EAAE,CAAC;gBACtB,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC;gBACzB,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC1B,OAAO;YACX,CAAC;YAED,IAAI,CAAC,QAAQ,GAAG,EAAE,GAAI,MAAM,EAAE,CAAC;YAC/B,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC7B,CAAC;QAED,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAE1B,KAAK,MAAM,QAAQ,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACzC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACvC,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACpD,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;oBACvB,MAAM,IAAI,iBAAiB,CAAC,mBAAmB,QAAQ,CAAC,IAAI,UAAU,CAAC,CAAC;gBAC5E,CAAC;gBACD,IAAI,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAChD,IAAI,CAAC,aAAa,EAAE,CAAC;oBACjB,aAAa,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;oBACzD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;gBAC/C,CAAC;YACL,CAAC;QACL,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YAC7B,OAAO;QACX,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC;QAC7B,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC;QAC9B,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,QAAQ;QACjB,8BAA8B;QAC9B,0BAA0B;QAE1B,IAAG,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC3B,YAAY;YACZ,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClC,QAAQ,EAAE,CAAC;YACf,CAAC;YACD,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,CAAC;YACzC,OAAO;QACX,CAAC;QAED,yCAAyC;QACzC,IAAI,QAAQ,KAAK,KAAK,CAAC,EAAE,CAAC;YACtB,~~KAAK~~,MAAM,~~QAAQ~~,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;~~gBACvC~~,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;gBAC9C,IAAI,OAAO,KAAK,KAAK,CAAC,EAAE,CAAC;oBACrB,~~IAAI,CAAC,~~MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,~~QAAQ~~,CAAC~~,QAAQ,CAAC,UAAU,CAAC,CAAC~~;~~gBAC/D~~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"}
1	+ {"version":3,"file":"ChangeEntry.js","sourceRoot":"","sources":["../../../src/model/changes/ChangeEntry.ts"],"names":[],"mappings":"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"}

package/dist/model/changes/ChangeSet.js CHANGED Viewed

@@ -56,7 +56,7 @@ export default class ChangeSet {
     getEntry(entity, original = void 0) {
         let entry = this.entryMap.get(entity);
         if (entry) {
-            return entry;
+            return entry.updateValues(original);
         }
         const c = Object.getPrototypeOf(entity).constructor;
         if (c === Object) {
@@ -70,7 +70,7 @@ export default class ChangeSet {
                 entity = existing;
                 entry = this.entryMap.get(entity);
                 if (entry) {
-                    return entry;
+                    return entry.updateValues(original);
                 }
             }
             else {

package/dist/model/changes/ChangeSet.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ChangeSet.js","sourceRoot":"","sources":["../../../src/model/changes/ChangeSet.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,mCAAmC,CAAC;AAClE,OAAO,QAAQ,MAAM,0BAA0B,CAAC;AAGhD,OAAO,eAAe,EAAE,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACpF,OAAO,WAAW,MAAM,kBAAkB,CAAC;AAE3C,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AAExD,MAAM,CAAC,OAAO,OAAO,SAAS;IAI1B,IAAI,CAAC,iBAAiB,CAAC;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAaD,YAAoB,OAAsB;QAAtB,YAAO,GAAP,OAAO,CAAe;QAjBnC,eAAU,GAAG,IAAI,QAAQ,CAAc,IAAI,CAAC,CAAC;QAMnC,YAAO,GAAkB,EAAE,CAAC;QAErC,aAAQ,GAA0B,IAAI,GAAG,EAAE,CAAC;QAEpD;;WAEG;QACK,gBAAW,GAAoB,IAAI,GAAG,EAAE,CAAC;QAEzC,WAAM,GAAG,CAAC,CAAC;IAGnB,CAAC;IAED,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC;QAEf,MAAM,OAAO,GAAG,EAAmB,CAAC;QACpC,MAAM,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC;YACD,IAAI,CAAC,aAAa,EAAE,CAAC;YAErB,KAAM,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAQ,CAAC;YAEvC,OAAM,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,MAAM,IAAI,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAkB,CAAC;gBACjD,KAAK,MAAM,QAAQ,IAAI,IAAI,EAAE,CAAC;oBAC1B,QAAQ,CAAC,sBAAsB,EAAE,CAAC;oBAClC,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACtB,CAAC;gBACD,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;gBACnB,KAAM,CAAC,CAAA,IAAW,CAAC;YACvB,CAAC;QAGL,CAAC;gBAAS,CAAC;YACP,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QACxB,CAAC;IACL,CAAC;IAED,CAAC,kBAAkB,CAAC,CAAC,KAAkB;QACnC,MAAM,OAAO,GAAG,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QACtE,IAAI,OAAO,EAAE,CAAC;YACV,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBAC7B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBACjC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC1C,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;oBACf,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBAClC,CAAC;gBACD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBACnC,OAAO;YACX,CAAC;YACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAChD,CAAC;IACL,CAAC;IAEM,QAAQ,CAAI,MAAS,EAAE,QAAQ,GAAG,KAAK,CAAC;QAC3C,IAAI,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,KAAK,EAAE,CAAC;YACR,OAAO,KAAK,CAAC;~~QACjB~~,CAAC;QACD,MAAM,CAAC,GAAG,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC;QACpD,IAAI,CAAC,KAAK,MAAM,EAAE,CAAC;YACf,MAAM,IAAI,iBAAiB,CAAC,qBAAqB,CAAC,CAAC;QACvD,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACjD,MAAM,OAAO,GAAG,eAAe,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC1D,IAAI,OAAO,EAAE,CAAC;YACV,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC/C,IAAI,QAAQ,EAAE,CAAC;gBACX,MAAM,GAAG,QAAQ,CAAC;gBAClB,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAClC,IAAI,KAAK,EAAE,CAAC;oBACR,OAAO,KAAK,CAAC;~~gBACjB~~,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC1C,CAAC;QACL,CAAC;QACD,KAAK,GAAG,IAAI,WAAW,CAAC;YACpB,IAAI;YACJ,MAAM;YACN,KAAK,EAAE,CAAC;YACR,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;YAC9C,MAAM,EAAE,WAAW;SACtB,EAAE,IAAI,CAAC,CAAC;QACT,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACjC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAChC,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;OAEG;IACI,aAAa;QAEhB,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAClC,QAAQ,CAAC,sBAAsB,EAAE,CAAC;QACtC,CAAC;QAED,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAClC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACtB,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;IAEnD,CAAC;IAED;;;OAGG;IACI,KAAK;QACR,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAClC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACtB,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;QACxB,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;CAEJ"}
1	+ {"version":3,"file":"ChangeSet.js","sourceRoot":"","sources":["../../../src/model/changes/ChangeSet.ts"],"names":[],"mappings":"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"}

package/dist/query/ast/ExpressionToSql.js CHANGED Viewed

@@ -69,9 +69,9 @@ export default class ExpressionToSql extends Visitor {
                 default:
                     throw new Error(`${s.type} Not supported`);
             }
-            return prepare `UPDATE ${this.visit(e.source)} SET
+            return prepare `UPDATE ${source}${as} SET
                 ${fields}
-            FROM ${source}${as}${joins}${where}${orderBy}${limit}${offset}`;
+            ${where}${orderBy}${limit}${offset}`;
         }
         return prepare `SELECT
         ${fields}

package/dist/query/ast/ExpressionToSql.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ExpressionToSql.js","sourceRoot":"","sources":["../../../src/query/ast/ExpressionToSql.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"ExpressionToSql.js","sourceRoot":"","sources":["../../../src/query/ast/ExpressionToSql.ts"],"names":[],"mappings":"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"}

package/dist/tests/db-tests/tests/update-items.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update-items.d.ts","sourceRoot":"","sources":["../../../../src/tests/db-tests/tests/update-items.ts"],"names":[],"mappings":"~~AACA~~,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGjD,yBAA8B,IAAI,EAAE,UAAU,~~iBAqB7C~~"}
1	+ {"version":3,"file":"update-items.d.ts","sourceRoot":"","sources":["../../../../src/tests/db-tests/tests/update-items.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGjD,yBAA8B,IAAI,EAAE,UAAU,iBAwB7C"}

package/dist/tests/db-tests/tests/update-items.js CHANGED Viewed

@@ -1,3 +1,4 @@
+import assert from "assert";
 import { createContext } from "../../model/createContext.js";
 export default async function () {
     if (!this.db) {
@@ -8,10 +9,12 @@ export default async function () {
     first.name = "First product";
     await context.saveChanges();
     await context.products
-        .where(void 0, (p) => (x) => x.productID > 0)
-        .trace(console.log)
+        .where(void 0, (p) => (x) => x.productID > 1)
         .update(void 0, (p) => (x) => ({
         productDescription: "updated"
     }));
+    // we must verify that productID's description should not have changed...
+    const p1 = await context.products.where(void 0, (p) => (x) => x.productID === 1).first();
+    assert.notStrictEqual("updated", p1.productDescription);
 }
 //# sourceMappingURL=update-items.js.map

package/dist/tests/db-tests/tests/update-items.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update-items.js","sourceRoot":"","sources":["../../../../src/tests/db-tests/tests/update-items.ts"],"names":[],"mappings":"~~AAEA~~,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,MAAM,CAAC,OAAO,CAAC,KAAK;IAEhB,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QACX,OAAO;IACX,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEjD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC;IAEnD,KAAK,CAAC,IAAI,GAAG,eAAe,CAAC;IAE7B,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC;IAG5B,MAAM,OAAO,CAAC,QAAQ;SACjB,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC;SAC5C,KAAK,CAAC,~~OAAO~~,CAAC,~~GAAG~~,CAAC;~~SAClB~~,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC~~;QAC3B~~,~~kBAAkB~~,EAAE,~~SAAS~~;~~KAChC~~,CAAC,CAAC,CAAC;~~AACZ~~,CAAC"}
1	+ {"version":3,"file":"update-items.js","sourceRoot":"","sources":["../../../../src/tests/db-tests/tests/update-items.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAG5B,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,MAAM,CAAC,OAAO,CAAC,KAAK;IAEhB,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QACX,OAAO;IACX,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEjD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC;IAEnD,KAAK,CAAC,IAAI,GAAG,eAAe,CAAC;IAE7B,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC;IAG5B,MAAM,OAAO,CAAC,QAAQ;SACjB,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC;SAC5C,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3B,kBAAkB,EAAE,SAAS;KAChC,CAAC,CAAC,CAAC;IAER,yEAAyE;IACzE,MAAM,EAAE,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;IACzF,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC;AAC5D,CAAC"}

package/dist/tests/expressions/left-joins/child-joins.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"child-joins.d.ts","sourceRoot":"","sources":["../../../../src/tests/expressions/left-joins/child-joins.ts"],"names":[],"mappings":"~~AAoEA~~,MAAM,CAAC,OAAO,mBA6Bb"}
1	+ {"version":3,"file":"child-joins.d.ts","sourceRoot":"","sources":["../../../../src/tests/expressions/left-joins/child-joins.ts"],"names":[],"mappings":"AAqFA,MAAM,CAAC,OAAO,mBA6Bb"}

package/dist/tests/expressions/left-joins/child-joins.js CHANGED Viewed

@@ -5,7 +5,8 @@ const sql1 = `SELECT
 p1.product_id,
 p1.name,
 p1.owner_id,
-p1.status
+p1.status,
+p1.product_description
 FROM products AS p1
 WHERE EXISTS (SELECT
 1
@@ -15,7 +16,8 @@ const sql2 = `SELECT
 p1.product_id,
 p1.name,
 p1.owner_id,
-p1.status
+p1.status,
+p1.product_description
 FROM products AS p1
 WHERE EXISTS (SELECT
 1
@@ -28,7 +30,8 @@ const sql3 = `SELECT
 p1.product_id,
 p1.name,
 p1.owner_id,
-p1.status
+p1.status,
+p1.product_description
 FROM products AS p1
 WHERE EXISTS (SELECT
 1
@@ -42,7 +45,8 @@ const productJoin = `SELECT
 p1.product_id,
 p1.name,
 p1.owner_id,
-p1.status
+p1.status,
+p1.product_description
 FROM products AS p1
  LEFT JOIN users AS u ON p1.owner_id = u.user_id
 WHERE u.date_created > $1`;
@@ -55,7 +59,20 @@ o1.amount
 FROM order_items AS o1
  LEFT JOIN products AS p ON o1.product_id = p.product_id
 WHERE (o1.product_id = $1) OR (p.owner_id = $2)`;
-const notExp = 'SELECT\n        p1.product_id,\n\t\tp1.name,\n\t\tp1.owner_id,\n\t\tp1.status\n        FROM products AS p1\n\tWHERE EXISTS (SELECT\n        1\n        FROM order_items AS o\n\tWHERE (p1.product_id = o.product_id) AND (o.product_id = $1)) AND  NOT (EXISTS (SELECT\n        1\n        FROM order_items AS o1\n\t\t INNER JOIN orders AS o2 ON o1.order_id = o2.order_id\n\tWHERE (p1.product_id = o1.product_id) AND (o2.order_date > $2)))';
+const notExp = `SELECT
+p1.product_id,
+p1.name,
+p1.owner_id,
+p1.status,
+p1.product_description
+FROM products AS p1
+WHERE EXISTS
+    (SELECT 1 FROM order_items AS o
+        WHERE (p1.product_id = o.product_id) AND (o.product_id = $1)) AND
+        NOT (EXISTS (SELECT 1 FROM order_items AS o1
+                INNER JOIN orders AS o2 ON o1.order_id = o2.order_id
+                    WHERE (p1.product_id = o1.product_id) AND (o2.order_date > $2)))
+`;
 export default function () {
     const context = new ShoppingContext(new PostgreSqlDriver({}));
     let query = context.products.where({ productID: 1 }, (p) => (x) => x.orderItems.some((o) => o.productID === p.productID));

package/dist/tests/expressions/left-joins/child-joins.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"child-joins.js","sourceRoot":"","sources":["../../../../src/tests/expressions/left-joins/child-joins.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,cAAc,EAAgB,MAAM,oBAAoB,CAAC;AAClE,OAAO,gBAAgB,MAAM,+CAA+C,CAAC;AAE7E,MAAM,IAAI,GAAG~~;;;;;;;;;8DASiD~~,CAAC;AAE/D,MAAM,IAAI,GAAG~~;;;;;;;;;;;;4DAY~~+C,CAAC;AAE7D,MAAM,IAAI,GAAG~~;;;;;;;;;;;;;gEAamD~~,CAAC;AAEjE,MAAM,WAAW,GAAG~~;;;;;;;0BAOM~~,CAAC;AAG3B,MAAM,KAAK,GAAG;;;;;;;;gDAQkC,CAAC;AAEjD,MAAM,MAAM,GAAG,~~kbAAkb,~~CAAC;~~AAElc~~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"}
1	+ {"version":3,"file":"child-joins.js","sourceRoot":"","sources":["../../../../src/tests/expressions/left-joins/child-joins.ts"],"names":[],"mappings":"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"}

package/dist/tests/expressions/trimInternal.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"trimInternal.d.ts","sourceRoot":"","sources":["../../../src/tests/expressions/trimInternal.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,YAAY,SAAU,MAAM,~~WAaxC~~,CAAC;AAEF,eAAO,MAAM,cAAc,aAAc,MAAM,UAAU,MAAM,~~SAK9D~~,CAAC"}
1	+ {"version":3,"file":"trimInternal.d.ts","sourceRoot":"","sources":["../../../src/tests/expressions/trimInternal.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,YAAY,SAAU,MAAM,WAgBxC,CAAC;AAEF,eAAO,MAAM,cAAc,aAAc,MAAM,UAAU,MAAM,SAI9D,CAAC"}

package/dist/tests/expressions/trimInternal.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { AssertionError } from "assert";
+import assert from "assert";
 export const trimInternal = (text) => {
     let r = "";
     for (const iterator of text) {
@@ -7,16 +7,18 @@ export const trimInternal = (text) => {
             case "\t":
             case "\r":
             case " ":
+                if (!r.endsWith(" ")) {
+                    r += " ";
+                }
                 continue;
         }
         r += iterator;
     }
-    return r;
+    return r.trim();
 };
 export const assertSqlMatch = (expected, actual) => {
-    if (trimInternal(expected) === trimInternal(actual)) {
-        return;
-    }
-    throw new AssertionError({ expected, actual, operator: "===" });
+    const expectedTrimmed = trimInternal(expected);
+    const actualTrimmed = trimInternal(actual);
+    assert.strictEqual(actualTrimmed, expectedTrimmed);
 };
 //# sourceMappingURL=trimInternal.js.map