Skip to content

Commit 02d040e

Browse files
committed
Refactor table column names to use uppercase for consistency in test utilities and E2E tests
1 parent 0e198ba commit 02d040e

2 files changed

Lines changed: 26 additions & 26 deletions

File tree

backend/test/ava-tests/complex-table-tests/complex-ibmdb2-table-e2e.test.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -267,16 +267,16 @@ test.serial(
267267
t.truthy(columnNames.includes(expectedCol), `Structure should include column ${expectedCol}`);
268268
}
269269

270-
const orderIdCol = structureRO.structure.find((col: any) => col.column_name === 'order_id');
271-
const customerIdCol = structureRO.structure.find((col: any) => col.column_name === 'customer_id');
270+
const orderIdCol = structureRO.structure.find((col: any) => col.column_name === 'ORDER_ID');
271+
const customerIdCol = structureRO.structure.find((col: any) => col.column_name === 'CUSTOMER_ID');
272272
t.truthy(orderIdCol);
273273
t.truthy(customerIdCol);
274274

275275
// Validate primaryColumns
276276
t.truthy(structureRO.primaryColumns);
277277
const primaryColumnNames = structureRO.primaryColumns.map((col: any) => col.column_name);
278-
t.truthy(primaryColumnNames.includes('order_id'));
279-
t.truthy(primaryColumnNames.includes('customer_id'));
278+
t.truthy(primaryColumnNames.includes('ORDER_ID'));
279+
t.truthy(primaryColumnNames.includes('CUSTOMER_ID'));
280280
} catch (e) {
281281
console.error(e);
282282
throw e;
@@ -313,12 +313,12 @@ test.serial(
313313
t.truthy(Array.isArray(structureRO.structure));
314314

315315
const columnNames = structureRO.structure.map((col: any) => col.column_name);
316-
t.truthy(columnNames.includes('item_id'));
317-
t.truthy(columnNames.includes('order_id'));
318-
t.truthy(columnNames.includes('customer_id'));
319-
t.truthy(columnNames.includes('product_name'));
320-
t.truthy(columnNames.includes('quantity'));
321-
t.truthy(columnNames.includes('price_per_unit'));
316+
t.truthy(columnNames.includes('ITEM_ID'));
317+
t.truthy(columnNames.includes('ORDER_ID'));
318+
t.truthy(columnNames.includes('CUSTOMER_ID'));
319+
t.truthy(columnNames.includes('PRODUCT_NAME'));
320+
t.truthy(columnNames.includes('QUANTITY'));
321+
t.truthy(columnNames.includes('PRICE_PER_UNIT'));
322322

323323
// Validate foreignKeys are present for referenced table
324324
t.truthy(structureRO.foreignKeys);
@@ -972,8 +972,8 @@ test.serial(
972972

973973
// Validate primaryColumns includes both composite key columns
974974
const primaryColumnNames = rowsRO.primaryColumns.map((col: any) => col.column_name);
975-
t.truthy(primaryColumnNames.includes('order_id'));
976-
t.truthy(primaryColumnNames.includes('customer_id'));
975+
t.truthy(primaryColumnNames.includes('ORDER_ID'));
976+
t.truthy(primaryColumnNames.includes('CUSTOMER_ID'));
977977
t.is(rowsRO.primaryColumns.length, 2);
978978

979979
// Validate row data

backend/test/utils/test-utilities/create-test-ibmdb2-tables.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -288,21 +288,21 @@ export const createTestIBMDB2TablesWithComplexPFKeys = async (connectionParams:
288288
return {
289289
first_referenced_table: {
290290
table_name: firstReferencedTableName,
291-
column_names: ['order_id', 'customer_id', 'item_id', 'product_name', 'quantity', 'price_per_unit'],
292-
primary_key_column_names: ['item_id'],
291+
column_names: ['ORDER_ID', 'CUSTOMER_ID', 'ITEM_ID', 'PRODUCT_NAME', 'QUANTITY', 'PRICE_PER_UNIT'],
292+
primary_key_column_names: ['ITEM_ID'],
293293
},
294294
main_table: {
295295
table_name: mainTableName,
296-
column_names: ['order_id', 'customer_id', 'order_date', 'status', 'total_amount'],
296+
column_names: ['ORDER_ID', 'CUSTOMER_ID', 'ORDER_DATE', 'STATUS', 'TOTAL_AMOUNT'],
297297
foreign_key_column_names: [],
298298
binary_column_names: [],
299-
primary_key_column_names: ['order_id', 'customer_id'],
299+
primary_key_column_names: ['ORDER_ID', 'CUSTOMER_ID'],
300300
},
301301
second_referenced_table: {
302302
table_name: referencedOnTableName,
303-
column_names: ['shipment_id', 'order_id', 'customer_id', 'shipped_date', 'carrier', 'tracking_number'],
304-
primary_key_column_names: ['shipment_id'],
305-
foreign_key_column_names: ['order_id', 'customer_id'],
303+
column_names: ['SHIPMENT_ID', 'ORDER_ID', 'CUSTOMER_ID', 'SHIPPED_DATE', 'CARRIER', 'TRACKING_NUMBER'],
304+
primary_key_column_names: ['SHIPMENT_ID'],
305+
foreign_key_column_names: ['ORDER_ID', 'CUSTOMER_ID'],
306306
},
307307
};
308308
};
@@ -550,21 +550,21 @@ export const createTestIBMDB2TablesWithSimplePFKeys = async (connectionParams: a
550550
return {
551551
main_table: {
552552
table_name: mainTableName,
553-
column_names: ['order_id', 'customer_id', 'order_date', 'status', 'total_amount'],
553+
column_names: ['ORDER_ID', 'CUSTOMER_ID', 'ORDER_DATE', 'STATUS', 'TOTAL_AMOUNT'],
554554
foreign_key_column_names: [],
555555
binary_column_names: [],
556-
primary_key_column_names: ['order_id'],
556+
primary_key_column_names: ['ORDER_ID'],
557557
},
558558
first_referenced_table: {
559559
table_name: firstReferencedTableName,
560-
column_names: ['item_id', 'order_id', 'product_name', 'quantity', 'price_per_unit'],
561-
primary_key_column_names: ['item_id'],
560+
column_names: ['ITEM_ID', 'ORDER_ID', 'PRODUCT_NAME', 'QUANTITY', 'PRICE_PER_UNIT'],
561+
primary_key_column_names: ['ITEM_ID'],
562562
},
563563
second_referenced_table: {
564564
table_name: referencedOnTableName,
565-
column_names: ['shipment_id', 'order_id', 'shipped_date', 'carrier', 'tracking_number'],
566-
primary_key_column_names: ['shipment_id'],
567-
foreign_key_column_names: ['order_id'],
565+
column_names: ['SHIPMENT_ID', 'ORDER_ID', 'SHIPPED_DATE', 'CARRIER', 'TRACKING_NUMBER'],
566+
primary_key_column_names: ['SHIPMENT_ID'],
567+
foreign_key_column_names: ['ORDER_ID'],
568568
},
569569
};
570570
};

0 commit comments

Comments
 (0)