everything should use schema name instead of "main" schema

outerbase · Sep 3, 2024 · b8c70f0 · b8c70f0
1 parent 8cb6644
commit b8c70f0
Show file tree

Hide file tree

Showing 14 changed files with 94 additions and 39 deletions.
diff --git a/src/components/gui/schema-editor/column-fk-popup.tsx b/src/components/gui/schema-editor/column-fk-popup.tsx
@@ -11,9 +11,11 @@ import { Separator } from "../../ui/separator";
 export default function ColumnForeignKeyPopup({
   constraint,
   disabled,
+  schemaName,
   onChange,
 }: Readonly<{
   constraint: DatabaseForeignKeyClause;
+  schemaName: string;
   disabled: boolean;
   onChange: ColumnChangeEvent;
 }>) {
@@ -33,6 +35,7 @@ export default function ColumnForeignKeyPopup({
           <div className="flex flex-col gap-2 mt-2">
             <Label className="text-xs font-normal">Foreign Table Name</Label>
             <TableCombobox
+              schemaName={schemaName}
               value={constraint.foreignTableName}
               disabled={disabled}
               onChange={(newTable) => {
@@ -64,7 +67,7 @@ export default function ColumnForeignKeyPopup({
                     },
                   });
                 }}
-                schemaName={"main"}
+                schemaName={schemaName}
                 tableName={constraint.foreignTableName}
               />
             </div>

diff --git a/src/components/gui/schema-editor/index.tsx b/src/components/gui/schema-editor/index.tsx
@@ -186,9 +186,11 @@ export default function SchemaEditor({
           columns={value.columns}
           onChange={onChange}
           onAddColumn={onAddColumn}
+          schemaName={value.schemaName}
         />
         <ColumnsProvider value={value.columns}>
           <SchemaEditorConstraintList
+            schemaName={value.schemaName}
             constraints={value.constraints}
             onChange={onChange}
             disabled={!isCreateScript}

diff --git a/src/components/gui/schema-editor/schema-editor-column-list.tsx b/src/components/gui/schema-editor/schema-editor-column-list.tsx
@@ -84,10 +84,12 @@ function changeColumnOnIndex(
 function ColumnItem({
   value,
   idx,
+  schemaName,
   onChange,
 }: {
   value: DatabaseTableColumnChange;
   idx: number;
+  schemaName?: string;
   onChange: Dispatch<SetStateAction<DatabaseTableSchemaChange>>;
 }) {
   const disabled = !!value.old;
@@ -198,11 +200,12 @@ function ColumnItem({
             />
           )}
 
-          {column.constraint?.foreignKey && (
+          {column.constraint?.foreignKey && schemaName && (
             <ColumnForeignKeyPopup
               constraint={column.constraint.foreignKey}
               disabled={disabled}
               onChange={change}
+              schemaName={schemaName}
             />
           )}
 
@@ -294,10 +297,12 @@ function ColumnItem({
 export default function SchemaEditorColumnList({
   columns,
   onChange,
+  schemaName,
   onAddColumn,
 }: Readonly<{
   columns: DatabaseTableColumnChange[];
   onChange: Dispatch<SetStateAction<DatabaseTableSchemaChange>>;
+  schemaName?: string;
   onAddColumn: () => void;
 }>) {
   const headerStyle = "text-xs p-2 text-left bg-secondary border";
@@ -318,7 +323,13 @@ export default function SchemaEditorColumnList({
         </thead>
         <tbody>
           {columns.map((col, idx) => (
-            <ColumnItem idx={idx} value={col} key={idx} onChange={onChange} />
+            <ColumnItem
+              idx={idx}
+              value={col}
+              key={idx}
+              onChange={onChange}
+              schemaName={schemaName}
+            />
           ))}
         </tbody>
         <tfoot>

diff --git a/src/components/gui/schema-editor/schema-editor-constraint-list.tsx b/src/components/gui/schema-editor/schema-editor-constraint-list.tsx
@@ -70,13 +70,15 @@ function ColumnForeignKey({
   constraint,
   onChange,
   disabled,
+  schemaName,
 }: Readonly<{
   constraint: DatabaseTableColumnConstraint;
   onChange: ConstraintChangeHandler;
   disabled?: boolean;
+  schemaName: string;
 }>) {
   const { columns } = useColumnList();
-  const { currentSchema } = useSchema();
+  const { schema } = useSchema();
 
   const columnMemo = useMemo(() => {
     return [...new Set(columns.map((c) => c.new?.name ?? c.old?.name ?? ""))];
@@ -86,7 +88,7 @@ function ColumnForeignKey({
     const fkTableName = constraint.foreignKey?.foreignTableName;
 
     if (fkTableName) {
-      const fkTableSchema = currentSchema.find(
+      const fkTableSchema = (schema[schemaName] ?? []).find(
         (s) => s.type === "table" && s.name === fkTableName
       );
 
@@ -96,7 +98,7 @@ function ColumnForeignKey({
     }
 
     return [];
-  }, [constraint, currentSchema]);
+  }, [constraint, schemaName, schema]);
 
   const onConstraintChange = useCallback(
     (newColumn: string[]) => {
@@ -137,6 +139,7 @@ function ColumnForeignKey({
       <td className="border">
         <TableCombobox
           borderless
+          schemaName={schemaName}
           disabled={disabled}
           onChange={onFkTableNameChange}
           value={constraint.foreignKey?.foreignTableName}
@@ -287,12 +290,14 @@ function RemovableConstraintItem({
 
 function ColumnItemBody({
   onChange,
+  schemaName,
   constraint,
   disabled,
 }: PropsWithChildren<{
   idx: number;
   onChange: Dispatch<SetStateAction<DatabaseTableSchemaChange>>;
   constraint: DatabaseTableConstraintChange;
+  schemaName?: string;
   disabled?: boolean;
 }>) {
   const onChangeConstraint = useCallback(
@@ -315,12 +320,13 @@ function ColumnItemBody({
   const currentConstraint = constraint.new ?? constraint.old;
   if (!currentConstraint) return null;
 
-  if (currentConstraint.foreignKey) {
+  if (currentConstraint.foreignKey && schemaName) {
     return (
       <ColumnForeignKey
         disabled={disabled}
         constraint={currentConstraint}
         onChange={onChangeConstraint}
+        schemaName={schemaName}
       />
     );
   }
@@ -362,19 +368,22 @@ function ColumnItem({
   constraint,
   onChange,
   idx,
+  schemaName,
   disabled,
 }: Readonly<{
   constraint: DatabaseTableConstraintChange;
   onChange: Dispatch<SetStateAction<DatabaseTableSchemaChange>>;
   idx: number;
   disabled?: boolean;
+  schemaName?: string;
 }>) {
   return (
     <RemovableConstraintItem idx={idx} onChange={onChange}>
       <ColumnItemBody
         constraint={constraint}
         onChange={onChange}
         idx={idx}
+        schemaName={schemaName}
         disabled={disabled}
       />
     </RemovableConstraintItem>
@@ -384,10 +393,12 @@ function ColumnItem({
 export default function SchemaEditorConstraintList({
   constraints,
   onChange,
+  schemaName,
   disabled,
 }: Readonly<{
   constraints: DatabaseTableConstraintChange[];
   onChange: Dispatch<SetStateAction<DatabaseTableSchemaChange>>;
+  schemaName?: string;
   disabled?: boolean;
 }>) {
   const headerClassName = "text-xs p-2 text-left bg-secondary border";
@@ -429,6 +440,7 @@ export default function SchemaEditorConstraintList({
                 constraint={constraint}
                 onChange={onChange}
                 disabled={disabled}
+                schemaName={schemaName}
               />
             );
           })}

diff --git a/src/components/gui/schema-sidebar.tsx b/src/components/gui/schema-sidebar.tsx
@@ -4,16 +4,18 @@ import SchemaList from "./schema-sidebar-list";
 import ListButtonItem from "./list-button-item";
 import { Separator } from "../ui/separator";
 import { openTab } from "@/messages/open-tab";
+import { useSchema } from "@/context/schema-provider";
 
 export default function SchemaView() {
   const [search, setSearch] = useState("");
+  const { currentSchemaName } = useSchema();
 
   const onNewTable = useCallback(() => {
     openTab({
       type: "schema",
-      schemaName: "main",
+      schemaName: currentSchemaName,
     });
-  }, []);
+  }, [currentSchemaName]);
 
   return (
     <div className="flex flex-col overflow-hidden grow">

diff --git a/src/components/gui/table-cell/generic-cell.tsx b/src/components/gui/table-cell/generic-cell.tsx
@@ -36,21 +36,27 @@ interface TableCellProps<T = unknown> {
 }
 
 interface SneakpeakProps {
+  fkSchemaName: string;
   fkTableName: string;
   fkColumnName: string;
   value: DatabaseValue;
 }
 
-function SnippetRow({ fkTableName, fkColumnName, value }: SneakpeakProps) {
+function SnippetRow({
+  fkSchemaName,
+  fkTableName,
+  fkColumnName,
+  value,
+}: SneakpeakProps) {
   const { databaseDriver } = useDatabaseDriver();
   const [data, setData] = useState<DatabaseResultSet>();
 
   useEffect(() => {
     databaseDriver
-      .findFirst("main", fkTableName, { [fkColumnName]: value })
+      .findFirst(fkSchemaName, fkTableName, { [fkColumnName]: value })
       .then(setData)
       .catch(console.error);
-  }, [databaseDriver, fkTableName, fkColumnName, value]);
+  }, [databaseDriver, fkSchemaName, fkTableName, fkColumnName, value]);
 
   if (!data) {
     return (
@@ -208,6 +214,7 @@ export default function GenericCell({
       return (
         <div className="flex items-center shrink-0 cursor-pointer ml-2">
           <ForeignKeyColumnSnippet
+            fkSchemaName={header.foreignKey.foreignSchemaName}
             fkColumnName={header.foreignKey.foreignColumns[0] as string}
             fkTableName={header.foreignKey.foreignTableName}
             value={value}

diff --git a/src/components/gui/table-combobox/TableColumnCombobox.tsx b/src/components/gui/table-combobox/TableColumnCombobox.tsx
@@ -39,7 +39,7 @@ export default function TableColumnCombobox({
         .catch(() => {
           setSchema({
             tableName,
-            schemaName: "main",
+            schemaName,
             columns: [],
             pk: [],
             autoIncrement: false,

diff --git a/src/components/gui/table-combobox/TableCombobox.tsx b/src/components/gui/table-combobox/TableCombobox.tsx
@@ -16,16 +16,18 @@ import { useSchema } from "@/context/schema-provider";
 export default function TableCombobox({
   value,
   onChange,
+  schemaName,
   disabled,
   borderless,
 }: Readonly<{
   value?: string;
+  schemaName: string;
   onChange: (v: string) => void;
   disabled?: boolean;
   borderless?: boolean;
 }>) {
   const [open, setOpen] = useState(false);
-  const { currentSchema, refresh } = useSchema();
+  const { schema, refresh } = useSchema();
 
   return (
     <Popover open={open} onOpenChange={setOpen}>
@@ -48,7 +50,7 @@ export default function TableCombobox({
 
           <CommandEmpty>No table found.</CommandEmpty>
           <CommandGroup className="max-h-[250px] overflow-y-auto">
-            {currentSchema.map((table) => (
+            {(schema[schemaName] ?? []).map((table) => (
               <CommandItem
                 key={table.name}
                 value={table.name}

diff --git a/src/components/gui/tabs/trigger-tab.tsx b/src/components/gui/tabs/trigger-tab.tsx
@@ -68,7 +68,11 @@ export default function TriggerTab({
               </SelectContent>
             </Select>
           </div>
-          <TableCombobox value={trigger?.tableName} onChange={noop} />
+          <TableCombobox
+            schemaName={schemaName}
+            value={trigger?.tableName}
+            onChange={noop}
+          />
         </div>
       </div>
       <div className="grow overflow-hidden">

diff --git a/src/components/lib/sql-execute-helper.ts b/src/components/lib/sql-execute-helper.ts
@@ -86,7 +86,7 @@ export async function commitChange({
 
   try {
     const result = await driver.updateTableData(
-      tableSchema.schemaName ?? "main",
+      tableSchema.schemaName,
       tableName,
       plans.map((p) => p.plan),
       tableSchema

diff --git a/src/drivers/base-driver.ts b/src/drivers/base-driver.ts
@@ -101,6 +101,7 @@ export type DatabaseForeignKeyAction =
   | "NO_ACTION";
 
 export interface DatabaseForeignKeyClause {
+  foreignSchemaName?: string;
   foreignTableName?: string;
   foreignColumns?: string[];
   columns?: string[];

diff --git a/src/drivers/sqlite-base-driver.ts b/src/drivers/sqlite-base-driver.ts
@@ -52,7 +52,7 @@ export abstract class SqliteLikeBaseDriver extends CommonSQLImplement {
             type: "table",
             schemaName,
             name: row.name,
-            tableSchema: parseCreateTableScript(row.sql),
+            tableSchema: parseCreateTableScript(schemaName, row.sql),
           });
         } catch {
           tmp.push({ type: "table", name: row.name, schemaName });
@@ -125,7 +125,7 @@ export abstract class SqliteLikeBaseDriver extends CommonSQLImplement {
       if (def) {
         const createScript = def.sql;
         return {
-          ...parseCreateTableScript(createScript),
+          ...parseCreateTableScript(schemaName, createScript),
           createScript,
           schemaName,
         };

diff --git a/src/drivers/sqlite/sql-parse-table.test.ts b/src/drivers/sqlite/sql-parse-table.test.ts
@@ -10,11 +10,11 @@ import {
 
 // Parse column constraint
 function pcc(sql: string) {
-  return parseColumnConstraint(buildSyntaxCursor(sql));
+  return parseColumnConstraint("main", buildSyntaxCursor(sql));
 }
 
 function p(sql: string) {
-  return parseCreateTableScript(sql);
+  return parseCreateTableScript("main", sql);
 }
 
 it("parse column constraint", () => {