af-db-ts 3.0.4 → 3.0.6

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 (23) hide show
  1. package/dist/cjs/src/pg/get-sql/insert.js +3 -2
  2. package/dist/cjs/src/pg/get-sql/insert.js.map +1 -1
  3. package/dist/cjs/src/pg/get-sql/reset-sequence.js +8 -3
  4. package/dist/cjs/src/pg/get-sql/reset-sequence.js.map +1 -1
  5. package/dist/cjs/src/pg/table-schema-pg.js +2 -1
  6. package/dist/cjs/src/pg/table-schema-pg.js.map +1 -1
  7. package/dist/esm/src/pg/get-sql/insert.js +3 -2
  8. package/dist/esm/src/pg/get-sql/insert.js.map +1 -1
  9. package/dist/esm/src/pg/get-sql/reset-sequence.js +8 -3
  10. package/dist/esm/src/pg/get-sql/reset-sequence.js.map +1 -1
  11. package/dist/esm/src/pg/table-schema-pg.js +2 -1
  12. package/dist/esm/src/pg/table-schema-pg.js.map +1 -1
  13. package/dist/types/src/@types/i-pg.d.ts +1 -0
  14. package/dist/types/src/@types/i-pg.d.ts.map +1 -1
  15. package/dist/types/src/pg/get-sql/insert.d.ts +1 -0
  16. package/dist/types/src/pg/get-sql/insert.d.ts.map +1 -1
  17. package/dist/types/src/pg/get-sql/reset-sequence.d.ts.map +1 -1
  18. package/dist/types/src/pg/table-schema-pg.d.ts.map +1 -1
  19. package/package.json +1 -1
  20. package/src/@types/i-pg.ts +1 -0
  21. package/src/pg/get-sql/insert.ts +4 -2
  22. package/src/pg/get-sql/reset-sequence.ts +8 -3
  23. package/src/pg/table-schema-pg.ts +2 -1
package/dist/cjs/src/pg/get-sql/insert.js CHANGED
@@ -8,8 +8,9 @@ const common_1 = require("../../common");
8
8
  const getInsertSqlPg = async (arg) => {
9
9
  const { commonSchemaAndTable } = arg;
10
10
  const tableSchema = await (0, table_schema_pg_1.getTableSchemaPg)(arg.connectionId, commonSchemaAndTable);
11
- const { columnsSchema, fieldsWoSerialsAndRO, defaults } = tableSchema;
12
- const insertFieldsArray = fieldsWoSerialsAndRO.filter((f) => (!(arg.excludeFromInsert || []).includes(f)));
11
+ const { columnsSchema, fieldsWoRO, fieldsWoSerialsAndRO, defaults } = tableSchema;
12
+ const insertFieldsListPre = arg.keepSerialFields ? fieldsWoRO : fieldsWoSerialsAndRO;
13
+ const insertFieldsArray = insertFieldsListPre.filter((f) => (!(arg.excludeFromInsert || []).includes(f)));
13
14
  const insertFieldsList = insertFieldsArray.map((f) => `"${f}"`).join(', ');
14
15
  const preparedRowsArray = arg.recordset.map((record) => {
15
16
  const preparedRecordValuesArray = insertFieldsArray.map((f) => {
package/dist/cjs/src/pg/get-sql/insert.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"insert.js","sourceRoot":"","sources":["../../../../../src/pg/get-sql/insert.ts"],"names":[],"mappings":";;;AAAA,wDAAsD;AACtD,oDAAqD;AAGrD,6CAAgD;AAChD,yCAAoC;AAE7B,MAAM,cAAc,GAAG,KAAK,EAAoC,GAOtE,EAAmB,EAAE;IACpB,MAAM,EAAE,oBAAoB,EAAE,GAAG,GAAG,CAAC;IAErC,MAAM,WAAW,GAAmB,MAAM,IAAA,kCAAgB,EAAC,GAAG,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;IACnG,MAAM,EAAE,aAAa,EAAE,oBAAoB,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC;IAEtE,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3G,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE3E,MAAM,iBAAiB,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACrD,MAAM,yBAAyB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC5D,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;YAClC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;gBAClB,OAAO,IAAA,iCAAiB,EAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;YAChD,CAAC;YACD,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC3B,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBAC3C,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,OAAO,aAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACH,OAAO,yBAAyB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClE,MAAM,GAAG,GAAG,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;IACzD,MAAM,MAAM,GAAG,mBAAW,CAAC,EAAE,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC;IACvD,0CAA0C;IAC1C,MAAM,SAAS,GAAG,eAAe,MAAM,KAAK,gBAAgB;8BAChC,MAAM,GAAG,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,wBAAwB,IAAI,GAAG,GAAG,CAAC;IACrG,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAvCW,QAAA,cAAc,kBAuCzB"}
1
+ {"version":3,"file":"insert.js","sourceRoot":"","sources":["../../../../../src/pg/get-sql/insert.ts"],"names":[],"mappings":";;;AAAA,wDAAsD;AACtD,oDAAqD;AAGrD,6CAAgD;AAChD,yCAAoC;AAE7B,MAAM,cAAc,GAAG,KAAK,EAAoC,GAQtE,EAAmB,EAAE;IACpB,MAAM,EAAE,oBAAoB,EAAE,GAAG,GAAG,CAAC;IAErC,MAAM,WAAW,GAAmB,MAAM,IAAA,kCAAgB,EAAC,GAAG,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;IACnG,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,oBAAoB,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC;IAElF,MAAM,mBAAmB,GAAG,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,oBAAoB,CAAC;IACrF,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1G,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE3E,MAAM,iBAAiB,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACrD,MAAM,yBAAyB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC5D,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;YAClC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;gBAClB,OAAO,IAAA,iCAAiB,EAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;YAChD,CAAC;YACD,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC3B,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBAC3C,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,OAAO,aAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACH,OAAO,yBAAyB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClE,MAAM,GAAG,GAAG,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;IACzD,MAAM,MAAM,GAAG,mBAAW,CAAC,EAAE,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC;IACvD,0CAA0C;IAC1C,MAAM,SAAS,GAAG,eAAe,MAAM,KAAK,gBAAgB;8BAChC,MAAM,GAAG,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,wBAAwB,IAAI,GAAG,GAAG,CAAC;IACrG,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAzCW,QAAA,cAAc,kBAyCzB"}
package/dist/cjs/src/pg/get-sql/reset-sequence.js CHANGED
@@ -7,9 +7,14 @@ const getResetSequenceSqlPg = async (arg) => {
7
7
  const { commonSchemaAndTable } = arg;
8
8
  const [schema, table] = utils_1.schemaTable.to.common(commonSchemaAndTable).split('.');
9
9
  const { serialsFields } = await (0, table_schema_pg_1.getTableSchemaPg)(arg.connectionId, commonSchemaAndTable);
10
- return serialsFields.map((incFName) => {
11
- const sequenceName = `${table}_${incFName}_seq`;
12
- return `SELECT setval('"${schema}"."${sequenceName}"', (SELECT MAX("${incFName}") FROM "${schema}"."${table}"));`;
10
+ // eslint-disable-next-line arrow-body-style
11
+ return serialsFields.map((serialFieldName) => {
12
+ return `SELECT setval(
13
+ pg_get_serial_sequence('"${schema}"."${table}"', '${serialFieldName}'),
14
+ (SELECT COALESCE(MAX("${serialFieldName}"), 1) FROM "${schema}"."${table}")
15
+ );`;
16
+ // const sequenceName = `${table}_${serialFieldName}_seq`;
17
+ // return `SELECT setval('"${schema}"."${sequenceName}"', (SELECT COALESCE(MAX("${serialFieldName}"), 1) FROM "${schema}"."${table}"));`;
13
18
  }).join('\n');
14
19
  };
15
20
  exports.getResetSequenceSqlPg = getResetSequenceSqlPg;
package/dist/cjs/src/pg/get-sql/reset-sequence.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"reset-sequence.js","sourceRoot":"","sources":["../../../../../src/pg/get-sql/reset-sequence.ts"],"names":[],"mappings":";;;AAAA,wDAAsD;AACtD,6CAAgD;AAEzC,MAAM,qBAAqB,GAAG,KAAK,EAAE,GAG3C,EAAmB,EAAE;IACpB,MAAM,EAAE,oBAAoB,EAAE,GAAG,GAAG,CAAC;IACrC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,mBAAW,CAAC,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE/E,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,IAAA,kCAAgB,EAAC,GAAG,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;IAEzF,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QACpC,MAAM,YAAY,GAAG,GAAG,KAAK,IAAI,QAAQ,MAAM,CAAC;QAChD,OAAO,mBAAmB,MAAM,MAAM,YAAY,oBAAoB,QAAQ,YAAY,MAAM,MAAM,KAAK,MAAM,CAAC;IACpH,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC,CAAC;AAbW,QAAA,qBAAqB,yBAahC"}
1
+ {"version":3,"file":"reset-sequence.js","sourceRoot":"","sources":["../../../../../src/pg/get-sql/reset-sequence.ts"],"names":[],"mappings":";;;AAAA,wDAAsD;AACtD,6CAAgD;AAEzC,MAAM,qBAAqB,GAAG,KAAK,EAAE,GAG3C,EAAmB,EAAE;IACpB,MAAM,EAAE,oBAAoB,EAAE,GAAG,GAAG,CAAC;IACrC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,mBAAW,CAAC,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE/E,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,IAAA,kCAAgB,EAAC,GAAG,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;IAEzF,4CAA4C;IAC5C,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,eAAe,EAAE,EAAE;QAC3C,OAAO;kDACuC,MAAM,MAAM,KAAK,QAAQ,eAAe;+CAC3C,eAAe,gBAAgB,MAAM,MAAM,KAAK;sBACzE,CAAC;QACnB,0DAA0D;QAC1D,yIAAyI;IAC3I,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC,CAAC;AAlBW,QAAA,qBAAqB,yBAkBhC"}
package/dist/cjs/src/pg/table-schema-pg.js CHANGED
@@ -144,9 +144,10 @@ const getTableSchemaPg = async (connectionId, commonSchemaAndTable) => {
144
144
  });
145
145
  const fieldsArray = Object.keys(columnsSchema);
146
146
  const readOnlyFields = Object.values(columnsSchema).filter((s) => s.readOnly).map((s) => s.name);
147
+ const fieldsWoRO = fieldsArray.filter((f) => !readOnlyFields.includes(f));
147
148
  const fieldsWoSerialsAndRO = fieldsArray.filter((f) => !serialsFields.includes(f) && !readOnlyFields.includes(f));
148
149
  tableSchema = {
149
- columnsSchema, pk, uc, defaults, serialsFields, fieldsArray, fieldsWoSerialsAndRO, readOnlyFields,
150
+ columnsSchema, pk, uc, defaults, serialsFields, fieldsArray, fieldsWoRO, fieldsWoSerialsAndRO, readOnlyFields,
150
151
  };
151
152
  tableSchemaHash[commonSchemaAndTable] = tableSchema;
152
153
  }
package/dist/cjs/src/pg/table-schema-pg.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"table-schema-pg.js","sourceRoot":"","sources":["../../../../src/pg/table-schema-pg.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"table-schema-pg.js","sourceRoot":"","sources":["../../../../src/pg/table-schema-pg.ts"],"names":[],"mappings":"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"}
package/dist/esm/src/pg/get-sql/insert.js CHANGED
@@ -5,8 +5,9 @@ import { NULL } from '../../common';
5
5
  export const getInsertSqlPg = async (arg) => {
6
6
  const { commonSchemaAndTable } = arg;
7
7
  const tableSchema = await getTableSchemaPg(arg.connectionId, commonSchemaAndTable);
8
- const { columnsSchema, fieldsWoSerialsAndRO, defaults } = tableSchema;
9
- const insertFieldsArray = fieldsWoSerialsAndRO.filter((f) => (!(arg.excludeFromInsert || []).includes(f)));
8
+ const { columnsSchema, fieldsWoRO, fieldsWoSerialsAndRO, defaults } = tableSchema;
9
+ const insertFieldsListPre = arg.keepSerialFields ? fieldsWoRO : fieldsWoSerialsAndRO;
10
+ const insertFieldsArray = insertFieldsListPre.filter((f) => (!(arg.excludeFromInsert || []).includes(f)));
10
11
  const insertFieldsList = insertFieldsArray.map((f) => `"${f}"`).join(', ');
11
12
  const preparedRowsArray = arg.recordset.map((record) => {
12
13
  const preparedRecordValuesArray = insertFieldsArray.map((f) => {
package/dist/esm/src/pg/get-sql/insert.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"insert.js","sourceRoot":"","sources":["../../../../../src/pg/get-sql/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGrD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAoC,GAOtE,EAAmB,EAAE;IACpB,MAAM,EAAE,oBAAoB,EAAE,GAAG,GAAG,CAAC;IAErC,MAAM,WAAW,GAAmB,MAAM,gBAAgB,CAAC,GAAG,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;IACnG,MAAM,EAAE,aAAa,EAAE,oBAAoB,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC;IAEtE,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3G,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE3E,MAAM,iBAAiB,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACrD,MAAM,yBAAyB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC5D,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;YAClC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;gBAClB,OAAO,iBAAiB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;YAChD,CAAC;YACD,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC3B,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBAC3C,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACH,OAAO,yBAAyB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClE,MAAM,GAAG,GAAG,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;IACzD,MAAM,MAAM,GAAG,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC;IACvD,0CAA0C;IAC1C,MAAM,SAAS,GAAG,eAAe,MAAM,KAAK,gBAAgB;8BAChC,MAAM,GAAG,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,wBAAwB,IAAI,GAAG,GAAG,CAAC;IACrG,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC"}
1
+ {"version":3,"file":"insert.js","sourceRoot":"","sources":["../../../../../src/pg/get-sql/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGrD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAoC,GAQtE,EAAmB,EAAE;IACpB,MAAM,EAAE,oBAAoB,EAAE,GAAG,GAAG,CAAC;IAErC,MAAM,WAAW,GAAmB,MAAM,gBAAgB,CAAC,GAAG,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;IACnG,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,oBAAoB,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC;IAElF,MAAM,mBAAmB,GAAG,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,oBAAoB,CAAC;IACrF,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1G,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE3E,MAAM,iBAAiB,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACrD,MAAM,yBAAyB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC5D,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;YAClC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;gBAClB,OAAO,iBAAiB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;YAChD,CAAC;YACD,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC3B,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBAC3C,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACH,OAAO,yBAAyB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClE,MAAM,GAAG,GAAG,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;IACzD,MAAM,MAAM,GAAG,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC;IACvD,0CAA0C;IAC1C,MAAM,SAAS,GAAG,eAAe,MAAM,KAAK,gBAAgB;8BAChC,MAAM,GAAG,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,wBAAwB,IAAI,GAAG,GAAG,CAAC;IACrG,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC"}
package/dist/esm/src/pg/get-sql/reset-sequence.js CHANGED
@@ -4,9 +4,14 @@ export const getResetSequenceSqlPg = async (arg) => {
4
4
  const { commonSchemaAndTable } = arg;
5
5
  const [schema, table] = schemaTable.to.common(commonSchemaAndTable).split('.');
6
6
  const { serialsFields } = await getTableSchemaPg(arg.connectionId, commonSchemaAndTable);
7
- return serialsFields.map((incFName) => {
8
- const sequenceName = `${table}_${incFName}_seq`;
9
- return `SELECT setval('"${schema}"."${sequenceName}"', (SELECT MAX("${incFName}") FROM "${schema}"."${table}"));`;
7
+ // eslint-disable-next-line arrow-body-style
8
+ return serialsFields.map((serialFieldName) => {
9
+ return `SELECT setval(
10
+ pg_get_serial_sequence('"${schema}"."${table}"', '${serialFieldName}'),
11
+ (SELECT COALESCE(MAX("${serialFieldName}"), 1) FROM "${schema}"."${table}")
12
+ );`;
13
+ // const sequenceName = `${table}_${serialFieldName}_seq`;
14
+ // return `SELECT setval('"${schema}"."${sequenceName}"', (SELECT COALESCE(MAX("${serialFieldName}"), 1) FROM "${schema}"."${table}"));`;
10
15
  }).join('\n');
11
16
  };
12
17
  //# sourceMappingURL=reset-sequence.js.map
package/dist/esm/src/pg/get-sql/reset-sequence.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"reset-sequence.js","sourceRoot":"","sources":["../../../../../src/pg/get-sql/reset-sequence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EAAE,GAG3C,EAAmB,EAAE;IACpB,MAAM,EAAE,oBAAoB,EAAE,GAAG,GAAG,CAAC;IACrC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,WAAW,CAAC,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE/E,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;IAEzF,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QACpC,MAAM,YAAY,GAAG,GAAG,KAAK,IAAI,QAAQ,MAAM,CAAC;QAChD,OAAO,mBAAmB,MAAM,MAAM,YAAY,oBAAoB,QAAQ,YAAY,MAAM,MAAM,KAAK,MAAM,CAAC;IACpH,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC,CAAC"}
1
+ {"version":3,"file":"reset-sequence.js","sourceRoot":"","sources":["../../../../../src/pg/get-sql/reset-sequence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EAAE,GAG3C,EAAmB,EAAE;IACpB,MAAM,EAAE,oBAAoB,EAAE,GAAG,GAAG,CAAC;IACrC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,WAAW,CAAC,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE/E,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;IAEzF,4CAA4C;IAC5C,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,eAAe,EAAE,EAAE;QAC3C,OAAO;kDACuC,MAAM,MAAM,KAAK,QAAQ,eAAe;+CAC3C,eAAe,gBAAgB,MAAM,MAAM,KAAK;sBACzE,CAAC;QACnB,0DAA0D;QAC1D,yIAAyI;IAC3I,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC,CAAC"}
package/dist/esm/src/pg/table-schema-pg.js CHANGED
@@ -141,9 +141,10 @@ export const getTableSchemaPg = async (connectionId, commonSchemaAndTable) => {
141
141
  });
142
142
  const fieldsArray = Object.keys(columnsSchema);
143
143
  const readOnlyFields = Object.values(columnsSchema).filter((s) => s.readOnly).map((s) => s.name);
144
+ const fieldsWoRO = fieldsArray.filter((f) => !readOnlyFields.includes(f));
144
145
  const fieldsWoSerialsAndRO = fieldsArray.filter((f) => !serialsFields.includes(f) && !readOnlyFields.includes(f));
145
146
  tableSchema = {
146
- columnsSchema, pk, uc, defaults, serialsFields, fieldsArray, fieldsWoSerialsAndRO, readOnlyFields,
147
+ columnsSchema, pk, uc, defaults, serialsFields, fieldsArray, fieldsWoRO, fieldsWoSerialsAndRO, readOnlyFields,
147
148
  };
148
149
  tableSchemaHash[commonSchemaAndTable] = tableSchema;
149
150
  }
package/dist/esm/src/pg/table-schema-pg.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"table-schema-pg.js","sourceRoot":"","sources":["../../../../src/pg/table-schema-pg.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"table-schema-pg.js","sourceRoot":"","sources":["../../../../src/pg/table-schema-pg.ts"],"names":[],"mappings":"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"}
package/dist/types/src/@types/i-pg.d.ts CHANGED
@@ -21,6 +21,7 @@ export interface ITableSchemaPg {
21
21
  fieldsArray: TFieldName[];
22
22
  serialsFields: TFieldName[];
23
23
  readOnlyFields: TFieldName[];
24
+ fieldsWoRO: TFieldName[];
24
25
  fieldsWoSerialsAndRO: TFieldName[];
25
26
  }
26
27
  export interface IPoolClientPg extends PoolClient {
package/dist/types/src/@types/i-pg.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"i-pg.d.ts","sourceRoot":"","sources":["../../../../src/@types/i-pg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,SAAS,CAAC,EAAE,WAAW,CAAC;CACzB;AAED,MAAM,WAAW,gBAAgB;IAC/B,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,CAAC;CAClC;AAED,MAAM,WAAW,oBAAoB;IACnC,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CACnC;AAED,MAAM,WAAW,cAAc;IAC7B,aAAa,EAAE,gBAAgB,CAAC;IAChC,EAAE,EAAE,MAAM,EAAE,CAAC;IACb,EAAE,EAAE,oBAAoB,CAAC;IACzB,QAAQ,EAAE;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC1C,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,aAAa,EAAE,UAAU,EAAE,CAAC;IAC5B,cAAc,EAAE,UAAU,EAAE,CAAC;IAC7B,oBAAoB,EAAE,UAAU,EAAE,CAAC;CACpC;AAED,MAAM,WAAW,aAAc,SAAQ,UAAU;IAC/C,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,QAAQ,CAAC;CACf;AAED,MAAM,WAAW,OAAQ,SAAQ,IAAI;IACnC,QAAQ,EAAE,aAAa,EAAE,CAAA;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAA;CAChC"}
1
+ {"version":3,"file":"i-pg.d.ts","sourceRoot":"","sources":["../../../../src/@types/i-pg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,SAAS,CAAC,EAAE,WAAW,CAAC;CACzB;AAED,MAAM,WAAW,gBAAgB;IAC/B,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,CAAC;CAClC;AAED,MAAM,WAAW,oBAAoB;IACnC,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CACnC;AAED,MAAM,WAAW,cAAc;IAC7B,aAAa,EAAE,gBAAgB,CAAC;IAChC,EAAE,EAAE,MAAM,EAAE,CAAC;IACb,EAAE,EAAE,oBAAoB,CAAC;IACzB,QAAQ,EAAE;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC1C,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,aAAa,EAAE,UAAU,EAAE,CAAC;IAC5B,cAAc,EAAE,UAAU,EAAE,CAAC;IAC7B,UAAU,EAAE,UAAU,EAAE,CAAC;IACzB,oBAAoB,EAAE,UAAU,EAAE,CAAC;CACpC;AAED,MAAM,WAAW,aAAc,SAAQ,UAAU;IAC/C,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,QAAQ,CAAC;CACf;AAED,MAAM,WAAW,OAAQ,SAAQ,IAAI;IACnC,QAAQ,EAAE,aAAa,EAAE,CAAA;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAA;CAChC"}
package/dist/types/src/pg/get-sql/insert.d.ts CHANGED
@@ -6,5 +6,6 @@ export declare const getInsertSqlPg: <U extends TDBRecord = TDBRecord>(arg: {
6
6
  excludeFromInsert?: string[];
7
7
  addOutputInserted?: boolean;
8
8
  isErrorOnConflict?: boolean;
9
+ keepSerialFields?: boolean;
9
10
  }) => Promise<string>;
10
11
  //# sourceMappingURL=insert.d.ts.map
package/dist/types/src/pg/get-sql/insert.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../../../src/pg/get-sql/insert.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAI9D,eAAO,MAAM,cAAc,GAAU,CAAC,SAAS,SAAS,mBAAoB;IAC1E,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,KAAG,OAAO,CAAC,MAAM,CAgCjB,CAAC"}
1
+ {"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../../../src/pg/get-sql/insert.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAI9D,eAAO,MAAM,cAAc,GAAU,CAAC,SAAS,SAAS,mBAAoB;IAC1E,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,KAAG,OAAO,CAAC,MAAM,CAiCjB,CAAC"}
package/dist/types/src/pg/get-sql/reset-sequence.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"reset-sequence.d.ts","sourceRoot":"","sources":["../../../../../src/pg/get-sql/reset-sequence.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,qBAAqB,QAAe;IAC/C,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;CAC9B,KAAG,OAAO,CAAC,MAAM,CAUjB,CAAC"}
1
+ {"version":3,"file":"reset-sequence.d.ts","sourceRoot":"","sources":["../../../../../src/pg/get-sql/reset-sequence.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,qBAAqB,QAAe;IAC/C,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;CAC9B,KAAG,OAAO,CAAC,MAAM,CAejB,CAAC"}
package/dist/types/src/pg/table-schema-pg.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"table-schema-pg.d.ts","sourceRoot":"","sources":["../../../../src/pg/table-schema-pg.ts"],"names":[],"mappings":"AAIA,OAAO,EAAe,cAAc,EAAE,gBAAgB,EAAwB,MAAM,gBAAgB,CAAC;AAErG,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAiI/C,eAAO,MAAM,gBAAgB,iBAAwB,MAAM,wBAAwB,MAAM,KAAG,OAAO,CAAC,cAAc,CA+BjH,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,SAAS,sBAAuB,CAAC,iBAAiB,gBAAgB,KAC/G;IACE,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAA;CAuBvB,CAAC"}
1
+ {"version":3,"file":"table-schema-pg.d.ts","sourceRoot":"","sources":["../../../../src/pg/table-schema-pg.ts"],"names":[],"mappings":"AAIA,OAAO,EAAe,cAAc,EAAE,gBAAgB,EAAwB,MAAM,gBAAgB,CAAC;AAErG,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAiI/C,eAAO,MAAM,gBAAgB,iBAAwB,MAAM,wBAAwB,MAAM,KAAG,OAAO,CAAC,cAAc,CAgCjH,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,SAAS,sBAAuB,CAAC,iBAAiB,gBAAgB,KAC/G;IACE,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAA;CAuBvB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "af-db-ts",
3
- "version": "3.0.4",
3
+ "version": "3.0.6",
4
4
  "description": "A highly specialized function library",
5
5
  "main": "./dist/cjs/src/index.js",
6
6
  "module": "./dist/esm/src/index.js",
package/src/@types/i-pg.ts CHANGED
@@ -23,6 +23,7 @@ export interface ITableSchemaPg {
23
23
  fieldsArray: TFieldName[], // массив имен всех полей
24
24
  serialsFields: TFieldName[], // массив имен полей типа identity
25
25
  readOnlyFields: TFieldName[], // массив имен полей ReadOnly
26
+ fieldsWoRO: TFieldName[], // массив имен полей без полей ReadOnly
26
27
  fieldsWoSerialsAndRO: TFieldName[], // массив имен полей без полей identity и ReadOnly
27
28
  }
28
29
 
package/src/pg/get-sql/insert.ts CHANGED
@@ -12,13 +12,15 @@ export const getInsertSqlPg = async <U extends TDBRecord = TDBRecord> (arg: {
12
12
  excludeFromInsert?: string[],
13
13
  addOutputInserted?: boolean,
14
14
  isErrorOnConflict?: boolean,
15
+ keepSerialFields?: boolean,
15
16
  }): Promise<string> => {
16
17
  const { commonSchemaAndTable } = arg;
17
18
 
18
19
  const tableSchema: ITableSchemaPg = await getTableSchemaPg(arg.connectionId, commonSchemaAndTable);
19
- const { columnsSchema, fieldsWoSerialsAndRO, defaults } = tableSchema;
20
+ const { columnsSchema, fieldsWoRO, fieldsWoSerialsAndRO, defaults } = tableSchema;
20
21
 
21
- const insertFieldsArray = fieldsWoSerialsAndRO.filter((f) => (!(arg.excludeFromInsert || []).includes(f)));
22
+ const insertFieldsListPre = arg.keepSerialFields ? fieldsWoRO : fieldsWoSerialsAndRO;
23
+ const insertFieldsArray = insertFieldsListPre.filter((f) => (!(arg.excludeFromInsert || []).includes(f)));
22
24
  const insertFieldsList = insertFieldsArray.map((f) => `"${f}"`).join(', ');
23
25
 
24
26
  const preparedRowsArray = arg.recordset.map((record) => {
package/src/pg/get-sql/reset-sequence.ts CHANGED
@@ -10,8 +10,13 @@ export const getResetSequenceSqlPg = async (arg: {
10
10
 
11
11
  const { serialsFields } = await getTableSchemaPg(arg.connectionId, commonSchemaAndTable);
12
12
 
13
- return serialsFields.map((incFName) => {
14
- const sequenceName = `${table}_${incFName}_seq`;
15
- return `SELECT setval('"${schema}"."${sequenceName}"', (SELECT MAX("${incFName}") FROM "${schema}"."${table}"));`;
13
+ // eslint-disable-next-line arrow-body-style
14
+ return serialsFields.map((serialFieldName) => {
15
+ return `SELECT setval(
16
+ pg_get_serial_sequence('"${schema}"."${table}"', '${serialFieldName}'),
17
+ (SELECT COALESCE(MAX("${serialFieldName}"), 1) FROM "${schema}"."${table}")
18
+ );`;
19
+ // const sequenceName = `${table}_${serialFieldName}_seq`;
20
+ // return `SELECT setval('"${schema}"."${sequenceName}"', (SELECT COALESCE(MAX("${serialFieldName}"), 1) FROM "${schema}"."${table}"));`;
16
21
  }).join('\n');
17
22
  };
package/src/pg/table-schema-pg.ts CHANGED
@@ -152,10 +152,11 @@ export const getTableSchemaPg = async (connectionId: string, commonSchemaAndTabl
152
152
  });
153
153
  const fieldsArray: string[] = Object.keys(columnsSchema);
154
154
  const readOnlyFields: string[] = Object.values(columnsSchema).filter((s) => s.readOnly).map((s) => s.name as string);
155
+ const fieldsWoRO: string[] = fieldsArray.filter((f) => !readOnlyFields.includes(f));
155
156
  const fieldsWoSerialsAndRO: string[] = fieldsArray.filter((f) => !serialsFields.includes(f) && !readOnlyFields.includes(f));
156
157
 
157
158
  tableSchema = {
158
- columnsSchema, pk, uc, defaults, serialsFields, fieldsArray, fieldsWoSerialsAndRO, readOnlyFields,
159
+ columnsSchema, pk, uc, defaults, serialsFields, fieldsArray, fieldsWoRO, fieldsWoSerialsAndRO, readOnlyFields,
159
160
  };
160
161
  tableSchemaHash[commonSchemaAndTable] = tableSchema;
161
162
  } catch (err) {