@mikro-orm/core 7.3.0-dev.17 → 7.3.0-dev.19

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 (35) hide show
  1. package/EntityManager.js +127 -32
  2. package/drivers/DatabaseDriver.d.ts +2 -0
  3. package/drivers/DatabaseDriver.js +16 -3
  4. package/entity/EntityAssigner.js +15 -3
  5. package/entity/EntityFactory.d.ts +7 -0
  6. package/entity/EntityFactory.js +37 -0
  7. package/entity/EntityLoader.js +24 -9
  8. package/entity/defineEntity.d.ts +22 -17
  9. package/entity/validators.js +4 -1
  10. package/hydration/ObjectHydrator.js +4 -0
  11. package/metadata/MetadataDiscovery.d.ts +10 -0
  12. package/metadata/MetadataDiscovery.js +171 -33
  13. package/metadata/MetadataStorage.d.ts +1 -0
  14. package/metadata/MetadataStorage.js +20 -3
  15. package/metadata/MetadataValidator.js +2 -1
  16. package/package.json +1 -1
  17. package/platforms/Platform.d.ts +4 -0
  18. package/platforms/Platform.js +8 -0
  19. package/serialization/EntitySerializer.js +52 -12
  20. package/typings.d.ts +21 -5
  21. package/typings.js +5 -2
  22. package/unit-of-work/ChangeSetComputer.js +2 -1
  23. package/unit-of-work/ChangeSetPersister.js +24 -5
  24. package/unit-of-work/CommitOrderCalculator.js +2 -1
  25. package/unit-of-work/UnitOfWork.js +20 -5
  26. package/utils/EntityComparator.d.ts +5 -0
  27. package/utils/EntityComparator.js +46 -6
  28. package/utils/QueryHelper.js +10 -2
  29. package/utils/RawQueryFragment.d.ts +5 -1
  30. package/utils/RawQueryFragment.js +27 -19
  31. package/utils/Utils.d.ts +2 -0
  32. package/utils/Utils.js +24 -8
  33. package/utils/clone.js +5 -7
  34. package/utils/fs-utils.js +19 -15
  35. package/utils/upsert-utils.js +2 -1
package/utils/upsert-utils.js CHANGED
@@ -103,7 +103,8 @@ export function getOnConflictReturningFields(meta, data, uniqueFields, options,
103
103
  if (p.lazy || p.embeddable) {
104
104
  return false;
105
105
  }
106
- if (p.autoincrement) {
106
+ // a PK missing in the data is generated by the database
107
+ if (p.autoincrement || (p.primary && data[p.name] == null)) {
107
108
  return true;
108
109
  }
109
110
  // for a raw `onConflictFields` fragment we can't introspect which columns form the conflict