af-db-ts 2.0.95 → 2.0.96

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.
@@ -31,7 +31,7 @@ const getInsertSqlPg = async (arg) => {
31
31
  const target = utils_1.schemaTable.to.pg(commonSchemaAndTable);
32
32
  // noinspection UnnecessaryLocalVariableJS
33
33
  const insertSQL = `INSERT INTO ${target} (${insertFieldsList})
34
- VALUES ${values} ON CONFLICT DO NOTHING ${out};`;
34
+ VALUES ${values}${arg.isErrorOnConflict ? '' : 'ON CONFLICT DO NOTHING'} ${out};`;
35
35
  return insertSQL;
36
36
  };
37
37
  exports.getInsertSqlPg = getInsertSqlPg;
@@ -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,GAMtE,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,2BAA2B,GAAG,GAAG,CAAC;IACpE,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAtCW,QAAA,cAAc,kBAsCzB"}
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"}
@@ -28,7 +28,7 @@ export const getInsertSqlPg = async (arg) => {
28
28
  const target = schemaTable.to.pg(commonSchemaAndTable);
29
29
  // noinspection UnnecessaryLocalVariableJS
30
30
  const insertSQL = `INSERT INTO ${target} (${insertFieldsList})
31
- VALUES ${values} ON CONFLICT DO NOTHING ${out};`;
31
+ VALUES ${values}${arg.isErrorOnConflict ? '' : 'ON CONFLICT DO NOTHING'} ${out};`;
32
32
  return insertSQL;
33
33
  };
34
34
  //# sourceMappingURL=insert.js.map
@@ -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,GAMtE,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,2BAA2B,GAAG,GAAG,CAAC;IACpE,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,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"}
@@ -5,5 +5,6 @@ export declare const getInsertSqlPg: <U extends TDBRecord = TDBRecord>(arg: {
5
5
  recordset: TRecordSet<U>;
6
6
  excludeFromInsert?: string[] | undefined;
7
7
  addOutputInserted?: boolean | undefined;
8
+ isErrorOnConflict?: boolean | undefined;
8
9
  }) => Promise<string>;
9
10
  //# sourceMappingURL=insert.d.ts.map
@@ -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;kBACX,MAAM;0BACE,MAAM;;;;MAI1B,QAAQ,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;kBACX,MAAM;0BACE,MAAM;;;;;MAK1B,QAAQ,MAAM,CAgCjB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "af-db-ts",
3
- "version": "2.0.95",
3
+ "version": "2.0.96",
4
4
  "description": "A highly specialized function library",
5
5
  "main": "./dist/cjs/src/index.js",
6
6
  "module": "./dist/esm/src/index.js",
@@ -11,6 +11,7 @@ export const getInsertSqlPg = async <U extends TDBRecord = TDBRecord> (arg: {
11
11
  recordset: TRecordSet<U>,
12
12
  excludeFromInsert?: string[],
13
13
  addOutputInserted?: boolean,
14
+ isErrorOnConflict?: boolean,
14
15
  }): Promise<string> => {
15
16
  const { commonSchemaAndTable } = arg;
16
17
 
@@ -41,6 +42,6 @@ export const getInsertSqlPg = async <U extends TDBRecord = TDBRecord> (arg: {
41
42
  const target = schemaTable.to.pg(commonSchemaAndTable);
42
43
  // noinspection UnnecessaryLocalVariableJS
43
44
  const insertSQL = `INSERT INTO ${target} (${insertFieldsList})
44
- VALUES ${values} ON CONFLICT DO NOTHING ${out};`;
45
+ VALUES ${values}${arg.isErrorOnConflict ? '' : 'ON CONFLICT DO NOTHING'} ${out};`;
45
46
  return insertSQL;
46
47
  };