WIP

mathesar-foundation · Jul 27, 2024 · 1814459 · 1814459
1 parent cdb87c4
commit 1814459
Show file tree

Hide file tree

Showing 76 changed files with 481 additions and 463 deletions.
diff --git a/mathesar_ui/src/api/rest/columns.ts b/mathesar_ui/src/api/rest/columns.ts
diff --git a/mathesar_ui/src/api/rest/types/queries.ts b/mathesar_ui/src/api/rest/types/queries.ts
@@ -1,6 +1,6 @@
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { JpPath } from '@mathesar/api/rest/types/tables/joinable_tables';
 import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
+import type { Column } from '@mathesar/api/rpc/columns';
 import type { Schema } from '@mathesar/api/rpc/schemas';
 
 export type QueryColumnAlias = string;

diff --git a/mathesar_ui/src/api/rest/types/tables/columns.ts b/mathesar_ui/src/api/rest/types/tables/columns.ts
diff --git a/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts b/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts
@@ -6,11 +6,11 @@
 
 import type { Table } from '@mathesar/api/rpc/tables';
 
-import type { Column } from './columns';
-
 type ForeignKeyId = number;
 type IsLinkReversed = boolean;
-export type JpPath = [Column['id'], Column['id']][];
+
+/** [attnum, attnum][] */
+export type JpPath = [number, number][];
 
 export interface JoinableTable {
   target: Table['oid']; // baseTableId
@@ -26,14 +26,14 @@ export interface JoinableTablesResult {
     string, // tableId
     {
       name: Table['name'];
-      columns: Column['id'][];
+      columns: number[];
     }
   >;
   columns: Record<
     string, // columnId
     {
-      name: Column['name'];
-      type: Column['type'];
+      name: string;
+      type: string;
     }
   >;
 }