Skip to content

Commit c73f70b

Browse files
committed
test(sql-orm-client): adopt entries.table storage shape in hand-built M:N contracts (TML-2808 rebase)
Main moved namespace tables under entries.table; the hand-built M:N test contracts still used the flat tables record, so table resolution missed them. Signed-off-by: Alexey Orlenko's AI Agent <robot@aqrln.net>
1 parent 4de651a commit c73f70b

2 files changed

Lines changed: 64 additions & 60 deletions

File tree

packages/3-extensions/sql-orm-client/test/helpers.ts

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -409,32 +409,34 @@ export function buildManyToManyContract(opts: {
409409
namespaces: {
410410
public: {
411411
id: 'public',
412-
tables: {
413-
parents: {
414-
columns: parentStorageColumns,
415-
primaryKey: { columns: localFields },
416-
uniques: [],
417-
indexes: [],
418-
foreignKeys: [],
419-
},
420-
children: {
421-
columns: Object.fromEntries(
422-
targetColumns.map((col) => [
423-
col,
424-
{ nativeType: 'int4', codecId: 'pg/int4@1', nullable: false },
425-
]),
426-
),
427-
primaryKey: { columns: targetColumns },
428-
uniques: [],
429-
indexes: [],
430-
foreignKeys: [],
431-
},
432-
[junctionTable]: {
433-
columns: junctionStorageColumns,
434-
primaryKey: { columns: [...parentColumns, ...childColumns] },
435-
uniques: [],
436-
indexes: [],
437-
foreignKeys: [],
412+
entries: {
413+
table: {
414+
parents: {
415+
columns: parentStorageColumns,
416+
primaryKey: { columns: localFields },
417+
uniques: [],
418+
indexes: [],
419+
foreignKeys: [],
420+
},
421+
children: {
422+
columns: Object.fromEntries(
423+
targetColumns.map((col) => [
424+
col,
425+
{ nativeType: 'int4', codecId: 'pg/int4@1', nullable: false },
426+
]),
427+
),
428+
primaryKey: { columns: targetColumns },
429+
uniques: [],
430+
indexes: [],
431+
foreignKeys: [],
432+
},
433+
[junctionTable]: {
434+
columns: junctionStorageColumns,
435+
primaryKey: { columns: [...parentColumns, ...childColumns] },
436+
uniques: [],
437+
indexes: [],
438+
foreignKeys: [],
439+
},
438440
},
439441
},
440442
},

packages/3-extensions/sql-orm-client/test/query-plan-select.test.ts

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -843,43 +843,45 @@ describe('M:N include correlated subquery', () => {
843843
namespaces: {
844844
public: {
845845
id: 'public',
846-
tables: {
847-
parents: {
848-
columns: { id: { nativeType: 'int4', codecId: 'pg/int4@1', nullable: false } },
849-
primaryKey: { columns: ['id'] },
850-
uniques: [],
851-
indexes: [],
852-
foreignKeys: [],
853-
},
854-
children: {
855-
columns: {
856-
id: { nativeType: 'int4', codecId: 'pg/int4@1', nullable: false },
857-
name: { nativeType: 'text', codecId: 'pg/text@1', nullable: false },
846+
entries: {
847+
table: {
848+
parents: {
849+
columns: { id: { nativeType: 'int4', codecId: 'pg/int4@1', nullable: false } },
850+
primaryKey: { columns: ['id'] },
851+
uniques: [],
852+
indexes: [],
853+
foreignKeys: [],
858854
},
859-
primaryKey: { columns: ['id'] },
860-
uniques: [],
861-
indexes: [],
862-
foreignKeys: [],
863-
},
864-
grandchildren: {
865-
columns: {
866-
id: { nativeType: 'int4', codecId: 'pg/int4@1', nullable: false },
867-
child_id: { nativeType: 'int4', codecId: 'pg/int4@1', nullable: false },
855+
children: {
856+
columns: {
857+
id: { nativeType: 'int4', codecId: 'pg/int4@1', nullable: false },
858+
name: { nativeType: 'text', codecId: 'pg/text@1', nullable: false },
859+
},
860+
primaryKey: { columns: ['id'] },
861+
uniques: [],
862+
indexes: [],
863+
foreignKeys: [],
868864
},
869-
primaryKey: { columns: ['id'] },
870-
uniques: [],
871-
indexes: [],
872-
foreignKeys: [],
873-
},
874-
parent_child: {
875-
columns: {
876-
parent_id: { nativeType: 'int4', codecId: 'pg/int4@1', nullable: false },
877-
child_id: { nativeType: 'int4', codecId: 'pg/int4@1', nullable: false },
865+
grandchildren: {
866+
columns: {
867+
id: { nativeType: 'int4', codecId: 'pg/int4@1', nullable: false },
868+
child_id: { nativeType: 'int4', codecId: 'pg/int4@1', nullable: false },
869+
},
870+
primaryKey: { columns: ['id'] },
871+
uniques: [],
872+
indexes: [],
873+
foreignKeys: [],
874+
},
875+
parent_child: {
876+
columns: {
877+
parent_id: { nativeType: 'int4', codecId: 'pg/int4@1', nullable: false },
878+
child_id: { nativeType: 'int4', codecId: 'pg/int4@1', nullable: false },
879+
},
880+
primaryKey: { columns: ['parent_id', 'child_id'] },
881+
uniques: [],
882+
indexes: [],
883+
foreignKeys: [],
878884
},
879-
primaryKey: { columns: ['parent_id', 'child_id'] },
880-
uniques: [],
881-
indexes: [],
882-
foreignKeys: [],
883885
},
884886
},
885887
},

0 commit comments

Comments
 (0)