@carbonorm/carbonnode 3.7.17 → 3.7.19

package/src/__tests__/sakila-db/sakila-schema.sql

@@ -684,3 +684,14 @@ SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
 
 
+--
+-- Table structure for table `binary_test`
+--
+
+DROP TABLE IF EXISTS `binary_test`;
+
+CREATE TABLE `binary_test` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `bin_col` binary(16) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

package/src/__tests__/sqlBuilders.test.ts

@@ -4,7 +4,7 @@ import { SelectQueryBuilder } from '../api/orm/queries/SelectQueryBuilder';
 import { PostQueryBuilder } from '../api/orm/queries/PostQueryBuilder';
 import { UpdateQueryBuilder } from '../api/orm/queries/UpdateQueryBuilder';
 import { DeleteQueryBuilder } from '../api/orm/queries/DeleteQueryBuilder';
-import { buildTestConfig } from './fixtures/c6.fixture';
+import { buildTestConfig, buildBinaryTestConfig } from './fixtures/c6.fixture';
 
 describe('SQL Builders', () => {
   it('builds SELECT with JOIN, WHERE, GROUP BY, HAVING and default LIMIT', () => {
@@ -135,5 +135,48 @@ describe('SQL Builders', () => {
     expect(Buffer.isBuffer(buf)).toBe(true);
     expect((buf as Buffer).length).toBe(16);
   });
+
+  it('converts hex to Buffer for BINARY columns in INSERT params', () => {
+    const config = buildBinaryTestConfig();
+    const qb = new PostQueryBuilder(config as any, {
+      [C6C.INSERT]: {
+        'binary_test.bin_col': '0123456789abcdef0123456789abcdef'
+      }
+    } as any, false);
+
+    const { params } = qb.build('binary_test');
+    const buf = (params as any[])[0];
+    expect(Buffer.isBuffer(buf)).toBe(true);
+    expect((buf as Buffer).length).toBe(16);
+  });
+
+  it('converts hex to Buffer for BINARY columns in UPDATE params', () => {
+    const config = buildBinaryTestConfig();
+    const qb = new UpdateQueryBuilder(config as any, {
+      [C6C.UPDATE]: {
+        'binary_test.bin_col': '0123456789abcdef0123456789abcdef'
+      },
+      WHERE: { 'binary_test.id': [C6C.EQUAL, 1] }
+    } as any, false);
+
+    const { params } = qb.build('binary_test');
+    const buf = (params as any[])[0];
+    expect(Buffer.isBuffer(buf)).toBe(true);
+    expect((buf as Buffer).length).toBe(16);
+  });
+  it('converts hex to Buffer for BINARY columns in UPDATE params with unqualified column', () => {
+    const config = buildBinaryTestConfig();
+    const qb = new UpdateQueryBuilder(config as any, {
+      [C6C.UPDATE]: {
+        'bin_col': '0123456789abcdef0123456789abcdef'
+      },
+      WHERE: { 'binary_test.id': [C6C.EQUAL, 1] }
+    } as any, false);
+
+    const { params } = qb.build('binary_test');
+    const buf = (params as any[])[0];
+    expect(Buffer.isBuffer(buf)).toBe(true);
+    expect((buf as Buffer).length).toBe(16);
+  });
 });
 

package/src/api/convertForRequestBody.ts

@@ -71,8 +71,8 @@ export default function <
                         }
                     }
                 }
-            } else if (Object.values(tableDefinition.COLUMNS).includes(value)) {
-                // Already a fully qualified column name
+            } else if (Object.keys(tableDefinition.COLUMNS).includes(value)) {
+                // Already using a fully qualified column name
                 const columnValue = restfulObject[value];
                 payload[value] = columnValue;
 

package/src/api/executors/HttpExecutor.ts

@@ -346,7 +346,9 @@ export class HttpExecutor<
 
             // todo - aggregate primary key check with condition check
             // check if PK exists in query, clone so pop does not affect the real data
-            const primaryKey = structuredClone(TABLES[operatingTable]?.PRIMARY)?.pop()?.split('.')?.pop();
+            const primaryKeyList = structuredClone(TABLES[operatingTable]?.PRIMARY);
+            const primaryKeyFullyQualified = primaryKeyList?.pop();
+            const primaryKey = primaryKeyFullyQualified?.split('.')?.pop();
 
             if (needsConditionOrPrimaryCheck) {
 
@@ -370,7 +372,7 @@ export class HttpExecutor<
 
                     if (undefined === query
                         || null === query
-                        || false === primaryKey in query) {
+                        || (!(primaryKey! in query) && !(primaryKeyFullyQualified && primaryKeyFullyQualified in query))) {
 
                         if (true === debug && isLocal()) {
 
@@ -382,8 +384,8 @@ export class HttpExecutor<
 
                     }
 
-                    if (undefined === query?.[primaryKey]
-                        || null === query?.[primaryKey]) {
+                    const providedPrimary = query?.[primaryKey!] ?? (primaryKeyFullyQualified ? query?.[primaryKeyFullyQualified] : undefined);
+                    if (undefined === providedPrimary || null === providedPrimary) {
 
                         toast.error('The primary key (' + primaryKey + ') provided is undefined or null explicitly!!')
 
@@ -401,12 +403,21 @@ export class HttpExecutor<
             if (POST !== requestMethod
                 && undefined !== query
                 && null !== query
-                && undefined !== primaryKey
-                && primaryKey in query) {
+                && undefined !== primaryKey) {
 
-                restRequestUri += query[primaryKey] + '/'
+                const primaryVal = query[primaryKey!] ?? (primaryKeyFullyQualified ? query[primaryKeyFullyQualified] : undefined);
 
-                console.log('query', query, 'primaryKey', primaryKey)
+                if (undefined !== primaryVal) {
+
+                    restRequestUri += primaryVal + '/'
+
+                    console.log('query', query, 'primaryKey', primaryKey)
+
+                } else {
+
+                    console.log('query', query)
+
+                }
 
             } else {
 

package/src/api/orm/builders/ConditionBuilder.ts

@@ -102,9 +102,9 @@ export abstract class ConditionBuilder<
         // Determine column definition from C6.TABLES to support type-aware conversions (e.g., BINARY hex -> Buffer)
         let columnDef: any | undefined;
         if (typeof column === 'string' && column.includes('.')) {
-            const [tableName] = column.split('.', 2);
+            const [tableName, colName] = column.split('.', 2);
             const table = this.config.C6?.TABLES?.[tableName];
-            columnDef = table?.TYPE_VALIDATION?.[column];
+            columnDef = table?.TYPE_VALIDATION?.[colName];
         }
         const val = convertHexIfBinary(column, value, columnDef);
 

package/src/api/orm/queries/UpdateQueryBuilder.ts

@@ -31,7 +31,11 @@ export class UpdateQueryBuilder<G extends OrmGenerics> extends PaginationBuilder
         }
 
         const setClauses = Object.entries(this.request[C6C.UPDATE])
-            .map(([col, val]) => `\`${this.trimTablePrefix(table, col)}\` = ${this.addParam(params, col, val)}`);
+            .map(([col, val]) => {
+                const trimmed = this.trimTablePrefix(table, col);
+                const qualified = `${table}.${trimmed}`;
+                return `\`${trimmed}\` = ${this.addParam(params, qualified, val)}`;
+            });
 
         sql += ` SET ${setClauses.join(', ')}`;