Merge pull request #920 from dyaskur/develop

fix: Cannot update column value with composite primary key and JSON column #916

src/common/libs/sqlUtils.ts

@@ -8,6 +8,7 @@ import customizations from '../customizations';
 import { ClientCode } from '../interfaces/antares';
 import { getArrayDepth } from './getArrayDepth';
 import hexToBinary, { HexChar } from './hexToBinary';
+import * as antares from 'common/interfaces/antares';
 
 /**
  * Escapes a string fo SQL use
@@ -209,3 +210,20 @@ export const jsonToSqlInsert = (args: {
 
    return insertsString;
 };
+
+export const formatJsonForSqlWhere = (jsonValue: object, clientType: antares.ClientCode) => {
+   const formattedValue = JSON.stringify(jsonValue);
+
+   switch (clientType) {
+      case 'mysql':
+         return ` = CAST('${formattedValue}' AS JSON)`;
+      case 'maria':
+         return ` = '${formattedValue}'`;
+      case 'pg':
+         return `::text = '${formattedValue}'`;
+      case 'firebird':
+      case 'sqlite':
+      default:
+         return ` = '${formattedValue}'`;
+   }
+};

src/main/ipc-handlers/tables.ts

@@ -3,7 +3,7 @@ import { ARRAY, BIT, BLOB, BOOLEAN, DATE, DATETIME, FLOAT, LONG_TEXT, NUMBER, TE
 import * as antares from 'common/interfaces/antares';
 import { InsertRowsParams } from 'common/interfaces/tableApis';
 import { fakerCustom } from 'common/libs/fakerCustom';
-import { sqlEscaper } from 'common/libs/sqlUtils';
+import { formatJsonForSqlWhere, sqlEscaper } from 'common/libs/sqlUtils';
 import { ipcMain } from 'electron';
 import * as fs from 'fs';
 import * as moment from 'moment';
@@ -233,9 +233,10 @@ export default (connections: Record<string, antares.Client>) => {
 
             for (const key in orgRow) {
                if (typeof orgRow[key] === 'string')
-                  orgRow[key] = `'${orgRow[key]}'`;
+                  orgRow[key] = ` = '${orgRow[key]}'`;
-
+               else if (typeof orgRow[key] === 'object' && orgRow[key] !== null)
-               if (orgRow[key] === null)
+                  orgRow[key] = formatJsonForSqlWhere(orgRow[key], connections[params.uid]._client);
+               else if (orgRow[key] === null)
                   orgRow[key] = `IS ${orgRow[key]}`;
                else
                   orgRow[key] = `= ${orgRow[key]}`;