@zyno-io/dk-server-foundation 26.328.813 → 26.330.741

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 (4) hide show
  1. package/dist/src/database/migration/create/entity-reader.js +11 -4
  2. package/dist/src/database/migration/create/entity-reader.js.map +1 -1
  3. package/package.json +1 -1
  4. package/src/database/migration/create/entity-reader.ts +10 -3
package/dist/src/database/migration/create/entity-reader.js CHANGED
@@ -288,7 +288,7 @@ function resolveColumnType(type, columnName, dialect, parentTableName) {
288
288
  return resolveEnumType(type, columnName, dialect, parentTableName);
289
289
  }
290
290
  // Primitive type map
291
- return resolvePrimitiveType(type, dialect);
291
+ return resolvePrimitiveType(type, dialect, columnName);
292
292
  }
293
293
  resolveColumnType.__type = ['Type', 'type', 'columnName', () => __ΩDialect, 'dialect', 'parentTableName', () => __ΩResolvedType, 'resolveColumnType', 'P"w!2"&2#n$2%&2&8Pn\',J/('];
294
294
  function resolveIntersectionType(type, columnName, dialect, parentTableName) {
@@ -413,12 +413,19 @@ function getMaxLength(type) {
413
413
  return undefined;
414
414
  }
415
415
  getMaxLength.__type = ['Type', 'type', 'getMaxLength', 'P"w!2"P\'-J/#'];
416
- function resolvePrimitiveType(type, dialect) {
416
+ function isIdColumn(columnName) {
417
+ return columnName === 'id' || columnName.endsWith('Id') || columnName.endsWith('_id');
418
+ }
419
+ isIdColumn.__type = ['columnName', 'isIdColumn', 'P&2!)/"'];
420
+ function resolvePrimitiveType(type, dialect, columnName) {
417
421
  switch (type.kind) {
418
422
  case type_1.ReflectionKind.string:
419
423
  return { type: 'varchar', size: 255 };
420
424
  case type_1.ReflectionKind.number:
421
- return dialect === 'mysql' ? { type: 'double' } : { type: 'double precision' };
425
+ if (dialect === 'mysql' && columnName && isIdColumn(columnName)) {
426
+ return { type: 'int', unsigned: true };
427
+ }
428
+ return { type: 'int' };
422
429
  case type_1.ReflectionKind.boolean:
423
430
  return dialect === 'mysql' ? { type: 'tinyint', size: 1 } : { type: 'boolean' };
424
431
  case type_1.ReflectionKind.bigint:
@@ -446,7 +453,7 @@ function resolvePrimitiveType(type, dialect) {
446
453
  return null;
447
454
  }
448
455
  }
449
- resolvePrimitiveType.__type = ['Type', 'type', () => __ΩDialect, 'dialect', () => __ΩResolvedType, 'resolvePrimitiveType', 'P"w!2"n#2$Pn%,J/&'];
456
+ resolvePrimitiveType.__type = ['Type', 'type', () => __ΩDialect, 'dialect', 'columnName', () => __ΩResolvedType, 'resolvePrimitiveType', 'P"w!2"n#2$&2%8Pn&,J/\''];
450
457
  function resolveClassType(type, dialect) {
451
458
  const className = type.classType?.name;
452
459
  switch (className) {
package/dist/src/database/migration/create/entity-reader.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"entity-reader.js","sourceRoot":"","sources":["../../../../../src/database/migration/create/entity-reader.ts"],"names":[],"mappings":";;AAkBA,gDAgBC;;;;;;;iEArBM,eAAe;AAbtB,wCAauB;AAEvB,yCAA4C;;sGACuE,gBAAgB;AAAnI,iDAAoI;AAEpI,SAAgB,kBAAkB,CAAC,EAAgB,EAAE,OAAgB;IACjE,MAAM,MAAM,GAAmB,IAAI,GAAG,EAAE,CAAC;IACzC,MAAM,QAAQ,GAAG,EAAE,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC;IAEzC,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC5B,MAAM,UAAU,GAAG,sBAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,SAAS,GAAG,UAAU,CAAC,iBAAiB,EAAE,IAAI,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC;QAC1E,IAAI,CAAC,SAAS;YAAE,SAAS;QAEzB,IAAI,8BAAe,CAAC,GAAG,CAAC,SAAS,CAAC;YAAE,SAAS;QAE7C,MAAM,KAAK,GAAG,eAAe,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;QAClE,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;;AAED,SAAS,eAAe,CAAC,UAAoC,EAAE,SAAiB,EAAE,OAAgB,EAAE,EAAgB;IAChH,MAAM,OAAO,GAAmB,EAAE,CAAC;IACnC,MAAM,OAAO,GAAkB,EAAE,CAAC;IAClC,MAAM,WAAW,GAAuB,EAAE,CAAC;IAC3C,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,MAAM,cAAc,IAAO,GAAG,cAAP,IAAI,GAAG,EAAU,CAAA,CAAC;IAEzC,+DAA+D;IAC/D,IAAI,eAAoD,CAAC;IACzD,IAAI,CAAC;QACD,8DAA8D;QAC9D,MAAM,SAAS,GAAI,UAAkB,CAAC,YAAY,EAAE,EAAE,IAAK,UAAU,CAAC,IAAY,EAAE,SAAS,CAAC;QAC9F,IAAI,SAAS;YAAE,eAAe,GAAG,IAAI,SAAS,EAAE,CAAC;IACrD,CAAC;IAAC,MAAM,CAAC;QACL,mDAAmD;IACvD,CAAC;IAED,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,EAAE,CAAC;IAC9C,IAAI,OAAO,GAAG,CAAC,CAAC;IAEhB,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,eAAe,EAAE;YAAE,SAAS;QAErC,0DAA0D;QAC1D,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACrB,MAAM,GAAG,GAAG,mBAAmB,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;YACzE,IAAI,GAAG,EAAE,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAClB,IAAI,GAAG,CAAC,YAAY;oBAAE,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAE/C,YAAY;gBACZ,MAAM,EAAE,GAAG,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;gBACxD,IAAI,EAAE;oBAAE,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACjC,CAAC;iBAAM,CAAC;gBACJ,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClC,CAAC;YACD,SAAS;QACb,CAAC;QAED,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;QAC7E,IAAI,GAAG,EAAE,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAClB,IAAI,GAAG,CAAC,YAAY;gBAAE,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACnD,CAAC;aAAM,CAAC;YACJ,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9B,OAAO,CAAC,IAAI,CAAC,sCAAsC,IAAI,CAAC,IAAI,SAAS,SAAS,sBAAsB,CAAC,CAAC;QAC1G,CAAC;IACL,CAAC;IAED,gFAAgF;IAChF,gFAAgF;IAChF,MAAM,IAAI,IAAO,GAAG,cAAP,IAAI,GAAG,EAAU,CAAA,CAAC;IAC/B,KAAK,MAAM,GAAG,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;QACnC,0DAA0D;QAC1D,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,cAAC,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,wBAAC;YAAE,SAAS;QAEzD,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,SAAS,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3E,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,SAAS;QAC7B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAEf,OAAO,CAAC,IAAI,CAAC;YACT,IAAI;YACJ,OAAO,EAAE,GAAG,CAAC,KAAK;YAClB,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,KAAK;YACnC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK;SACtE,CAAC,CAAC;IACP,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC;AAC9E,CAAC;;AAED,SAAS,UAAU,CACf,IAAwB,EACxB,OAAe,EACf,OAAgB,EAChB,SAAkB,EAClB,eAAyC;IAEzC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACvB,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IACxE,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAE3B,MAAM,GAAG,GAAiB;QACtB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,KAAK,EAAE,QAAQ,CAAC,KAAK;QACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,KAAK;QACpC,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,IAAI,CAAC,UAAU,EAAE;QAChD,aAAa,EAAE,IAAI,CAAC,eAAe,EAAE;QACrC,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE;QACjC,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB;QAC7C,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,eAAe,EAAE,OAAO;KAC3B,CAAC;IAEF,2CAA2C;IAC3C,IAAI,eAAe,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;QACxC,MAAM,GAAG,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YACpC,IAAI,GAAG,YAAY,IAAI,EAAE,CAAC;gBACtB,GAAG,CAAC,iBAAiB,GAAG,mBAAmB,CAAC;YAChD,CAAC;iBAAM,IAAI,OAAO,GAAG,KAAK,SAAS,EAAE,CAAC;gBAClC,GAAG,CAAC,YAAY,GAAG,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YACxF,CAAC;iBAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;gBACjC,GAAG,CAAC,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YACnC,CAAC;iBAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;gBACjC,GAAG,CAAC,YAAY,GAAG,GAAG,CAAC;YAC3B,CAAC;QACL,CAAC;IACL,CAAC;IAED,oCAAoC;IACpC,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;QACtB,MAAM,kBAAkB,GAAG,qBAAc,CAAC,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QACzE,IAAI,kBAAkB,EAAE,IAAI,KAAK,qBAAc,CAAC,OAAO,IAAI,OAAO,kBAAkB,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YACxG,GAAG,CAAC,kBAAkB,GAAI,kBAAkB,CAAC,OAAkB,CAAC,WAAW,EAAE,CAAC;QAClF,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;;AAED,SAAS,mBAAmB,CACxB,IAAwB,EACxB,OAAe,EACf,OAAgB,EAChB,GAAiB,EACjB,SAAkB;IAElB,8DAA8D;IAC9D,MAAM,QAAQ,GAAG,IAAI,CAAC,0BAA0B,EAAE,CAAC;IAEnD,6DAA6D;IAC7D,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,EAAE,CAAC,MAAM,cAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,EAAE,wBAAC,CAAC;IAC1E,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,CAAC,IAAI,CACR,yCAAyC,IAAI,CAAC,IAAI,SAAS,SAAS,IAAI,GAAG,MAAM;YAC7E,sBAAsB,QAAQ,CAAC,IAAI,SAAS,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,4BAA4B,CAC3H,CAAC;QACF,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,KAAK,GAAG,QAAQ,CAAC,UAAU,EAAE,CAAC;IACpC,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IAExB,sDAAsD;IACtD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IAC9E,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAE3B,OAAO;QACH,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,KAAK,EAAE,QAAQ,CAAC,KAAK;QACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,KAAK;QACpC,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,IAAI,CAAC,UAAU,EAAE;QAChD,aAAa,EAAE,KAAK;QACpB,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE;QACjC,eAAe,EAAE,OAAO;KAC3B,CAAC;AACN,CAAC;;AAED,SAAS,cAAc,CAAC,IAAwB,EAAE,SAAiB,EAAE,QAAiB,EAAE,GAAiB;IACrG,MAAM,QAAQ,GAAG,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACnD,MAAM,YAAY,GAAG,QAAQ,CAAC,iBAAiB,EAAE,IAAI,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC;IAEzE,gEAAgE;IAChE,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,EAAE,CAAC,MAAM,cAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,EAAE,wBAAC,CAAC;IAC1E,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,iDAAiD;QACjD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,KAAK,GAAG,QAAQ,CAAC,UAAU,EAAE,CAAC;IACpC,IAAI,CAAC,KAAK,IAAI,CAAC,YAAY;QAAE,OAAO,IAAI,CAAC;IAEzC,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;IAChC,MAAM,QAAQ,GAAW,GAAG,EAAE,QAAQ,IAAI,SAAS,CAAC;IACpD,wFAAwF;IACxF,iGAAiG;IACjG,MAAM,QAAQ,GAAY,GAA+B,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAE,GAA+B,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAEpI,OAAO;QACH,IAAI,EAAE,MAAM,SAAS,IAAI,IAAI,CAAC,IAAI,EAAE;QACpC,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;QACpB,eAAe,EAAE,YAAY;QAC7B,iBAAiB,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;QAC/B,QAAQ,EAAE,QAAQ,CAAC,WAAW,EAAE;QAChC,QAAQ,EAAE,QAAQ,CAAC,WAAW,EAAE;KACnC,CAAC;AACN,CAAC;;;AAaD,SAAS,iBAAiB,CAAC,IAAU,EAAE,UAAkB,EAAE,OAAgB,EAAE,eAAwB;IACjG,uEAAuE;IACvE,IAAI,IAAI,CAAC,IAAI,KAAK,qBAAc,CAAC,KAAK,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,cAC7B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,qBAAc,CAAC,SAAS,IAAI,CAAC,CAAC,IAAI,KAAK,qBAAc,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,qBAAc,CAAC,OAAO,IAAI,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC,wBAC3I,CAAC;QACF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;QAC/E,CAAC;QACD,wFAAwF;QACxF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,KAAK,cAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,qBAAc,CAAC,OAAO,IAAI,OAAQ,CAAiB,CAAC,OAAO,KAAK,QAAQ,wBAAC,EAAE,CAAC;YAChI,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,cAAC,CAAC,CAAC,EAAE,CAAE,CAAiB,CAAC,OAAiB,wBAAC,CAAC;YAC5E,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC;gBACzB,MAAM,QAAQ,GAAG,eAAe,CAAC,CAAC,CAAC,GAAG,eAAe,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;gBACnF,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,CAAC;YAC9E,CAAC;YACD,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC;QACtD,CAAC;QAED,+DAA+D;QAC/D,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,KAAK,cAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,qBAAc,CAAC,OAAO,IAAI,OAAQ,CAAiB,CAAC,OAAO,KAAK,QAAQ,wBAAC,EAAE,CAAC;YAChI,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,cAAC,CAAC,CAAC,EAAE,CAAE,CAAiB,CAAC,OAAiB,wBAAC,CAAC;YACzE,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC;YACtC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC;YACtC,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;gBACtB,IAAI,MAAM,IAAI,CAAC,IAAI,MAAM,IAAI,GAAG;oBAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;gBAC7E,IAAI,MAAM,IAAI,CAAC,GAAG,IAAI,MAAM,IAAI,GAAG;oBAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;gBAChE,IAAI,MAAM,IAAI,CAAC,IAAI,MAAM,IAAI,KAAK;oBAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;gBAChF,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;YAC3B,CAAC;YACD,IAAI,MAAM,IAAI,CAAC,KAAK,IAAI,MAAM,IAAI,KAAK;gBAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;YACrE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAC3B,CAAC;QAED,qEAAqE;QACrE,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CACR,6BAA6B,UAAU,IAAI,eAAe,CAAC,CAAC,CAAC,QAAQ,eAAe,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG;gBAC3F,yBAAyB,OAAO,CAAC,MAAM,iDAAiD,CAC/F,CAAC;YACF,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;QAC/E,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,yDAAyD;IACzD,IAAI,IAAI,CAAC,IAAI,KAAK,qBAAc,CAAC,YAAY,EAAE,CAAC;QAC5C,OAAO,uBAAuB,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;IAC/E,CAAC;IAED,6BAA6B;IAC7B,MAAM,QAAQ,GAAG,qBAAc,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAC3D,IAAI,QAAQ,EAAE,IAAI,KAAK,qBAAc,CAAC,OAAO,EAAE,CAAC;QAC5C,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,OAAiB,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1E,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC;IAC9B,CAAC;IAED,mEAAmE;IACnE,IAAI,IAAA,iBAAU,EAAC,IAAI,CAAC,EAAE,CAAC;QACnB,OAAO,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IACjF,CAAC;IAED,6CAA6C;IAC7C,MAAM,YAAY,IAAG,yBAAkB,CAAC,WAAW,2BAA9B,yBAAkB,CAAC,WAAW,CAAoB,IAAI,EAAE,OAAO,CAAC,CAAA,CAAC;IACtF,IAAI,YAAY,EAAE,IAAI,EAAE,CAAC;QACrB,OAAO,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;IACrD,CAAC;IAED,oCAAoC;IACpC,MAAM,mBAAmB,IAAG,yBAAkB,CAAC,WAAW,2BAA9B,yBAAkB,CAAC,WAAW,CAAoB,IAAI,EAAE,GAAG,CAAC,CAAA,CAAC;IACzF,IAAI,mBAAmB,EAAE,IAAI,EAAE,CAAC;QAC5B,OAAO,EAAE,IAAI,EAAE,mBAAmB,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;IAC5D,CAAC;IAED,+BAA+B;IAC/B,MAAM,gBAAgB,GAAG,qBAAc,CAAC,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACrE,IAAI,gBAAgB,EAAE,IAAI,KAAK,qBAAc,CAAC,OAAO,IAAI,OAAO,gBAAgB,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QACpG,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,CAAC,OAAO,EAAE,CAAC;IAC5D,CAAC;IAED,6CAA6C;IAC7C,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAChD,CAAC;IAED,aAAa;IACb,IAAI,IAAI,CAAC,IAAI,KAAK,qBAAc,CAAC,IAAI,EAAE,CAAC;QACpC,OAAO,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;IACvE,CAAC;IAED,qBAAqB;IACrB,OAAO,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC/C,CAAC;;AAED,SAAS,uBAAuB,CAAC,IAAsB,EAAE,UAAkB,EAAE,OAAgB,EAAE,eAAwB;IACnH,iFAAiF;IACjF,MAAM,YAAY,IAAG,yBAAkB,CAAC,WAAW,2BAA9B,yBAAkB,CAAC,WAAW,CAAoB,IAAI,EAAE,OAAO,CAAC,CAAA,CAAC;IACtF,IAAI,YAAY,EAAE,IAAI,EAAE,CAAC;QACrB,OAAO,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;IACrD,CAAC;IAED,oDAAoD;IACpD,MAAM,mBAAmB,IAAG,yBAAkB,CAAC,WAAW,2BAA9B,yBAAkB,CAAC,WAAW,CAAoB,IAAI,EAAE,GAAG,CAAC,CAAA,CAAC;IACzF,IAAI,mBAAmB,EAAE,IAAI,EAAE,CAAC;QAC5B,OAAO,EAAE,IAAI,EAAE,mBAAmB,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;IAC5D,CAAC;IAED,mCAAmC;IACnC,MAAM,QAAQ,GAAG,qBAAc,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAC3D,IAAI,QAAQ,EAAE,IAAI,KAAK,qBAAc,CAAC,OAAO,EAAE,CAAC;QAC5C,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,OAAiB,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1E,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC;IAC9B,CAAC;IAED,+EAA+E;IAC/E,IAAI,IAAA,iBAAU,EAAC,IAAI,CAAC,EAAE,CAAC;QACnB,OAAO,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IACjF,CAAC;IAED,qCAAqC;IACrC,MAAM,gBAAgB,GAAG,qBAAc,CAAC,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACrE,IAAI,gBAAgB,EAAE,IAAI,KAAK,qBAAc,CAAC,OAAO,IAAI,OAAO,gBAAgB,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QACpG,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,CAAC,OAAO,EAAE,CAAC;IAC5D,CAAC;IAED,mCAAmC;IACnC,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAChD,CAAC;IAED,6DAA6D;IAC7D,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QAC9B,sEAAsE;QACtE,IACI,MAAM,CAAC,IAAI,KAAK,qBAAc,CAAC,KAAK;YACpC,MAAM,CAAC,IAAI,KAAK,qBAAc,CAAC,MAAM;YACrC,MAAM,CAAC,IAAI,KAAK,qBAAc,CAAC,MAAM;YACrC,MAAM,CAAC,IAAI,KAAK,qBAAc,CAAC,OAAO;YACtC,MAAM,CAAC,IAAI,KAAK,qBAAc,CAAC,MAAM;YACrC,MAAM,CAAC,IAAI,KAAK,qBAAc,CAAC,IAAI,EACrC,CAAC;YACC,MAAM,MAAM,GAAG,iBAAiB,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;YAC/E,IAAI,MAAM;gBAAE,OAAO,MAAM,CAAC;QAC9B,CAAC;IACL,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;;AAED,SAAS,eAAe,CAAC,QAAgB,EAAE,KAAW,EAAE,QAAiB;IACrE,QAAQ,QAAQ,EAAE,CAAC;QACf,KAAK,MAAM;YACP,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QACtC,KAAK,MAAM;YACP,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAC5B,KAAK,OAAO,CAAC;QACb,KAAK,WAAW;YACZ,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QACzC;YACI,OAAO,IAAI,CAAC;IACpB,CAAC;AACL,CAAC;;AAED,SAAS,eAAe,CAAC,IAAc,EAAE,UAAkB,EAAE,OAAgB,EAAE,eAAwB;IACnG,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,cAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,wBAAC,CAAC;IAElD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAErC,cAAc;IACd,IAAI,OAAO,MAAM,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;QAChC,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,cAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,wBAAC,CAAC;QAC9E,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC;YACzB,MAAM,QAAQ,GAAG,eAAe,CAAC,CAAC,CAAC,GAAG,eAAe,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;YACnF,OAAO;gBACH,IAAI,EAAE,MAAM;gBACZ,UAAU,EAAE,YAAY;gBACxB,YAAY,EAAE,QAAQ;aACzB,CAAC;QACN,CAAC;QACD,OAAO;YACH,IAAI,EAAE,MAAM;YACZ,UAAU,EAAE,YAAY;SAC3B,CAAC;IACN,CAAC;IAED,eAAe;IACf,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,cAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,wBAAC,CAAC;IAC3E,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC;IACtC,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;QACtB,IAAI,MAAM,IAAI,CAAC,IAAI,MAAM,IAAI,GAAG;YAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QAC7E,IAAI,MAAM,IAAI,CAAC,GAAG,IAAI,MAAM,IAAI,GAAG;YAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAChE,IAAI,MAAM,IAAI,CAAC,IAAI,MAAM,IAAI,KAAK;YAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QAChF,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAC3B,CAAC;IACD,IAAI,MAAM,IAAI,CAAC,KAAK,IAAI,MAAM,IAAI,KAAK;QAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IACrE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AAC3B,CAAC;;AAED,SAAS,YAAY,CAAC,IAAU;IAC5B,sDAAsD;IACtD,IAAI,CAAC;QACD,MAAM,WAAW,GAAG,2BAAoB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC9D,IAAI,WAAW,EAAE,CAAC;YACd,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;gBACnC,IAAI,UAAU,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBAClC,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;oBACjC,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,qBAAc,CAAC,OAAO,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;wBAChF,OAAO,GAAG,CAAC,OAAO,CAAC;oBACvB,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACL,8CAA8C;IAClD,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;;AAED,SAAS,oBAAoB,CAAC,IAAU,EAAE,OAAgB;IACtD,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAChB,KAAK,qBAAc,CAAC,MAAM;YACtB,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;QAE1C,KAAK,qBAAc,CAAC,MAAM;YACtB,OAAO,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;QAEnF,KAAK,qBAAc,CAAC,OAAO;YACvB,OAAO,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAEpF,KAAK,qBAAc,CAAC,MAAM;YACtB,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;QAE9B,KAAK,qBAAc,CAAC,KAAK;YACrB,OAAO,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3C,KAAK,qBAAc,CAAC,aAAa,CAAC;QAClC,KAAK,qBAAc,CAAC,KAAK;YACrB,OAAO,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAEtE,KAAK,qBAAc,CAAC,GAAG;YACnB,OAAO,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAEtE,KAAK,qBAAc,CAAC,OAAO,CAAC,CAAC,CAAC;YAC1B,uDAAuD;YACvD,MAAM,OAAO,GAAI,IAAoB,CAAC,OAAO,CAAC;YAC9C,IAAI,OAAO,OAAO,KAAK,QAAQ;gBAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;YACvE,IAAI,OAAO,OAAO,KAAK,QAAQ;gBAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;YACxD,IAAI,OAAO,OAAO,KAAK,SAAS,EAAE,CAAC;gBAC/B,OAAO,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;YACpF,CAAC;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;QAED;YACI,OAAO,IAAI,CAAC;IACpB,CAAC;AACL,CAAC;;AAED,SAAS,gBAAgB,CAAC,IAAe,EAAE,OAAgB;IACvD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC;IAEvC,QAAQ,SAAS,EAAE,CAAC;QAChB,KAAK,MAAM;YACP,OAAO,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;QAE9E,KAAK,YAAY;YACb,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;gBACtB,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;YAC7B,CAAC;YACD,6CAA6C;YAC7C,OAAO,IAAI,CAAC;QAEhB,KAAK,aAAa,CAAC;QACnB,KAAK,YAAY;YACb,OAAO,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAEtE;YACI,uBAAuB;YACvB,OAAO,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAC1E,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"entity-reader.js","sourceRoot":"","sources":["../../../../../src/database/migration/create/entity-reader.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zyno-io/dk-server-foundation",
3
- "version": "26.328.813",
3
+ "version": "26.330.741",
4
4
  "description": "TypeScript server foundation built on the Deepkit framework",
5
5
  "homepage": "https://github.com/zyno-io/dk-server-foundation#readme",
6
6
  "bugs": {
package/src/database/migration/create/entity-reader.ts CHANGED
@@ -332,7 +332,7 @@ function resolveColumnType(type: Type, columnName: string, dialect: Dialect, par
332
332
  }
333
333
 
334
334
  // Primitive type map
335
- return resolvePrimitiveType(type, dialect);
335
+ return resolvePrimitiveType(type, dialect, columnName);
336
336
  }
337
337
 
338
338
  function resolveIntersectionType(type: TypeIntersection, columnName: string, dialect: Dialect, parentTableName?: string): ResolvedType | null {
@@ -461,13 +461,20 @@ function getMaxLength(type: Type): number | undefined {
461
461
  return undefined;
462
462
  }
463
463
 
464
- function resolvePrimitiveType(type: Type, dialect: Dialect): ResolvedType | null {
464
+ function isIdColumn(columnName: string): boolean {
465
+ return columnName === 'id' || columnName.endsWith('Id') || columnName.endsWith('_id');
466
+ }
467
+
468
+ function resolvePrimitiveType(type: Type, dialect: Dialect, columnName?: string): ResolvedType | null {
465
469
  switch (type.kind) {
466
470
  case ReflectionKind.string:
467
471
  return { type: 'varchar', size: 255 };
468
472
 
469
473
  case ReflectionKind.number:
470
- return dialect === 'mysql' ? { type: 'double' } : { type: 'double precision' };
474
+ if (dialect === 'mysql' && columnName && isIdColumn(columnName)) {
475
+ return { type: 'int', unsigned: true };
476
+ }
477
+ return { type: 'int' };
471
478
 
472
479
  case ReflectionKind.boolean:
473
480
  return dialect === 'mysql' ? { type: 'tinyint', size: 1 } : { type: 'boolean' };