web,graphql: Progress on doltgres support

dolthub · Aug 20, 2024 · 19c4a67 · 19c4a67
1 parent 08bf568
commit 19c4a67
Show file tree

Hide file tree

Showing 13 changed files with 99 additions and 122 deletions.
diff --git a/graphql-server/src/queryFactory/doltgres/index.ts b/graphql-server/src/queryFactory/doltgres/index.ts
@@ -63,25 +63,25 @@ export class DoltgresQueryFactory
 
   async createNewBranch(args: t.BranchArgs & { fromRefName: string }): t.PR {
     return this.query(
-      qh.callNewBranch,
-      [args.branchName, args.fromRefName],
+      `SELECT DOLT_BRANCH('${args.branchName}', '${args.fromRefName}')`,
+      [],
       args.databaseName,
     );
   }
 
   async callDeleteBranch(args: t.BranchArgs): t.PR {
     return this.query(
-      qh.callDeleteBranch,
-      [args.branchName],
+      `SELECT DOLT_BRANCH('-D', '${args.branchName}')`,
+      [],
       args.databaseName,
     );
   }
 
   async getLogs(args: t.RefArgs, offset: number): t.PR {
     return handleRefNotFound(async () =>
       this.query(
-        qh.doltLogsQuery,
-        [args.refName, ROW_LIMIT + 1, offset],
+        `SELECT * FROM DOLT_LOG('${args.refName}', '--parents') LIMIT ${ROW_LIMIT + 1} OFFSET ${offset}`,
+        [],
         args.databaseName,
       ),
     );
@@ -90,80 +90,81 @@ export class DoltgresQueryFactory
   async getTwoDotLogs(args: t.RefsArgs): t.PR {
     return handleRefNotFound(async () =>
       this.query(
-        qh.twoDotDoltLogsQuery,
-        [`${args.toRefName}..${args.fromRefName}`],
+        `SELECT * FROM DOLT_LOG('${args.toRefName}..${args.fromRefName}', '--parents')`,
+        [],
         args.databaseName,
       ),
     );
   }
 
   async getDiffStat(args: t.RefsMaybeTableArgs): t.PR {
     return this.query(
-      qh.getDiffStatQuery(!!args.tableName),
-      [args.fromRefName, args.toRefName, args.tableName],
+      `SELECT * FROM DOLT_DIFF_STAT('${args.fromRefName}', '${args.toRefName}'${args.tableName ? `, '${args.tableName}'` : ""})`,
+      [],
       args.databaseName,
       args.refName,
     );
   }
 
   async getThreeDotDiffStat(args: t.RefsMaybeTableArgs): t.PR {
     return this.query(
-      qh.getThreeDotDiffStatQuery(!!args.tableName),
-      [`${args.toRefName}...${args.fromRefName}`, args.tableName],
+      `SELECT * FROM DOLT_DIFF_STAT('${args.toRefName}...${args.fromRefName}'${args.tableName ? `, '${args.tableName}'` : ""})`,
+      [],
       args.databaseName,
       args.refName,
     );
   }
 
   async getDiffSummary(args: t.RefsMaybeTableArgs): t.PR {
+    const refArgs = [args.fromRefName, args.toRefName];
     return this.query(
-      qh.getDiffSummaryQuery(!!args.tableName),
-      [args.fromRefName, args.toRefName, args.tableName],
+      `SELECT * FROM DOLT_DIFF_SUMMARY('${args.fromRefName}', '${args.toRefName}'${args.tableName ? `, '${args.tableName}'` : ""})`,
+      [],
       args.databaseName,
       args.refName,
     );
   }
 
   async getThreeDotDiffSummary(args: t.RefsMaybeTableArgs): t.PR {
     return this.query(
-      qh.getThreeDotDiffSummaryQuery(!!args.tableName),
-      [`${args.toRefName}...${args.fromRefName}`, args.tableName],
+      `SELECT * FROM DOLT_DIFF_SUMMARY('${args.toRefName}...${args.fromRefName}'${args.tableName ? `, '${args.tableName}'` : ""})`,
+      [],
       args.databaseName,
       args.refName,
     );
   }
 
   async getSchemaPatch(args: t.RefsTableArgs): t.PR {
     return this.query(
-      qh.schemaPatchQuery,
-      [args.fromRefName, args.toRefName, args.tableName],
+      `SELECT * FROM DOLT_PATCH('${args.fromRefName}', '${args.toRefName}', '${args.tableName}') WHERE diff_type='schema'`,
+      [],
       args.databaseName,
       args.refName,
     );
   }
 
   async getThreeDotSchemaPatch(args: t.RefsTableArgs): t.PR {
     return this.query(
-      qh.threeDotSchemaPatchQuery,
-      [`${args.toRefName}...${args.fromRefName}`, args.tableName],
+      `SELECT * FROM DOLT_PATCH('${args.toRefName}...${args.fromRefName}', '${args.tableName}') WHERE diff_type='schema'`,
+      [],
       args.databaseName,
       args.refName,
     );
   }
 
   async getSchemaDiff(args: t.RefsTableArgs): t.PR {
     return this.query(
-      qh.schemaDiffQuery,
-      [args.fromRefName, args.toRefName, args.tableName],
+      `SELECT * FROM DOLT_SCHEMA_DIFF('${args.fromRefName}', '${args.toRefName}', '${args.tableName}')`,
+      [],
       args.databaseName,
       args.refName,
     );
   }
 
   async getThreeDotSchemaDiff(args: t.RefsTableArgs): t.PR {
     return this.query(
-      qh.threeDotSchemaDiffQuery,
-      [`${args.toRefName}...${args.fromRefName}`, args.tableName],
+      `SELECT * FROM DOLT_SCHEMA_DIFF('${args.toRefName}...${args.fromRefName}', '${args.tableName}')`,
+      [],
       args.databaseName,
       args.refName,
     );
@@ -214,14 +215,21 @@ export class DoltgresQueryFactory
       params.push(getAuthorString(args.author));
     }
     return this.query(
-      qh.getCallNewTag(!!args.message, !!args.author),
+      `SELECT DOLT_TAG('${args.tagName}', '${args.fromRefName}'${args.message ? `, '-m', '${args.message}'` : ""}${qh.getAuthorNameString(
+        !!args.author,
+        `'${args.author}'`,
+      )})`,
       params,
       args.databaseName,
     );
   }
 
   async callDeleteTag(args: t.TagArgs): t.PR {
-    return this.query(qh.callDeleteTag, [args.tagName], args.databaseName);
+    return this.query(
+      `SELECT DOLT_TAG('-d', '${args.tagName}')`,
+      [],
+      args.databaseName,
+    );
   }
 
   async callMerge(
@@ -238,7 +246,10 @@ export class DoltgresQueryFactory
         if (args.author) {
           params.push(getAuthorString(args.author));
         }
-        const res = await query(qh.getCallMerge(!!args.author), params);
+        const res = await query(
+          `SELECT DOLT_MERGE('${args.fromBranchName}', '--no-ff', '-m', 'Merge branch ${args.fromBranchName}'${qh.getAuthorNameString(!!args.author, `'${args.author}'`)})`,
+          params,
+        );
 
         if (res.length && res[0].conflicts !== "0") {
           await query("ROLLBACK");

diff --git a/graphql-server/src/queryFactory/doltgres/queries.ts b/graphql-server/src/queryFactory/doltgres/queries.ts
@@ -23,9 +23,9 @@ import { RawRows } from "../types";
 
 // BRANCHES
 
-export const callNewBranch = `CALL DOLT_BRANCH($1, $2)`;
+export const callNewBranch = `SELECT DOLT_BRANCH($1, $2)`;
 
-export const callDeleteBranch = `CALL DOLT_BRANCH('-D', $1)`;
+export const callDeleteBranch = `SELECT DOLT_BRANCH('-D', $1)`;
 
 // COMMITS
 
@@ -61,21 +61,21 @@ export const threeDotSchemaDiffQuery = `SELECT * FROM DOLT_SCHEMA_DIFF($1, $2)`;
 // PULLS
 
 export const getCallMerge = (hasAuthor = false) =>
-  `CALL DOLT_MERGE($1, '--no-ff', '-m', $2${getAuthorNameString(hasAuthor, 3)})`;
+  `SELECT DOLT_MERGE($1, '--no-ff', '-m', $2${getAuthorNameString(hasAuthor, "$3")})`;
 
 // TAGS
 
-export const callDeleteTag = `CALL DOLT_TAG('-d', $1)`;
+export const callDeleteTag = `SELECT DOLT_TAG('-d', $1)`;
 
 export const getCallNewTag = (hasMessage = false, hasAuthor = false) =>
-  `CALL DOLT_TAG($1, $2${hasMessage ? `, '-m', $3` : ""}${getAuthorNameString(
+  `SELECT DOLT_TAG($1, $2${hasMessage ? `, '-m', $3` : ""}${getAuthorNameString(
     hasAuthor,
-    hasMessage ? 4 : 3,
+    hasMessage ? "$4" : "$3",
   )})`;
 
-function getAuthorNameString(hasAuthor: boolean, n: number): string {
+export function getAuthorNameString(hasAuthor: boolean, n: string): string {
   if (!hasAuthor) return "";
-  return `, '--author', $${n}`;
+  return `, '--author', ${n}`;
 }
 
 // TODO: Columns

diff --git a/graphql-server/src/queryFactory/postgres/index.ts b/graphql-server/src/queryFactory/postgres/index.ts
@@ -30,8 +30,12 @@ export class PostgresQueryFactory
     return this.handleAsyncQuery(async qr => qr.createSchema(args.schemaName));
   }
 
-  async checkoutDatabase(qr: QueryRunner, dbName: string): Promise<void> {
-    await qr.query(qh.setSearchPath(dbName, this.isDolt));
+  async checkoutDatabase(
+    qr: QueryRunner,
+    dbName: string,
+    refName?: string,
+  ): Promise<void> {
+    await qr.query(qh.setSearchPath(dbName, refName, this.isDolt));
   }
 
   async getTableNames(args: t.RefArgs): Promise<string[]> {

diff --git a/graphql-server/src/queryFactory/postgres/queries.ts b/graphql-server/src/queryFactory/postgres/queries.ts
@@ -1,5 +1,13 @@
-export const setSearchPath = (dbName: string, _isDolt = false) =>
-  `SET SEARCH_PATH = '${dbName}'`;
+export const setSearchPath = (
+  dbName: string,
+  refName?: string,
+  isDolt = false,
+) => {
+  if (refName && isDolt) {
+    return `SET SEARCH_PATH = '${dbName}/${refName}'`;
+  }
+  return `SET SEARCH_PATH = '${dbName}'`;
+};
 
 export const databasesQuery = `SELECT datname FROM pg_database`;
 

diff --git a/graphql-server/src/tables/upload.resolver.ts b/graphql-server/src/tables/upload.resolver.ts
@@ -77,7 +77,17 @@ export class FileUploadResolver {
     const qr = this.connResolver.connection().getQR();
     const pgConnection = await qr.connect();
 
-    await pgConnection.query(setSearchPath(args.databaseName));
+    let isDolt = false;
+    try {
+      const res = await pgConnection.query("SELECT dolt_version()");
+      isDolt = !!res;
+    } catch (_) {
+      // ignore
+    }
+
+    await pgConnection.query(
+      setSearchPath(args.databaseName, args.refName, isDolt),
+    );
 
     try {
       await pipeline(

diff --git a/web/components/pageComponents/ConnectionsPage/NewConnection/index.tsx b/web/components/pageComponents/ConnectionsPage/NewConnection/index.tsx
@@ -69,9 +69,7 @@ export default function NewConnection(props: Props) {
               options={[
                 { label: "MySQL/Dolt", value: DatabaseType.Mysql },
                 {
-                  label: "Postgres",
-                  // TODO(doltgres): Uncomment when ready
-                  // label: "Postgres/Doltgres",
+                  label: "Postgres/Doltgres",
                   value: DatabaseType.Postgres,
                 },
               ]}

diff --git a/web/components/pageComponents/ConnectionsPage/index.tsx b/web/components/pageComponents/ConnectionsPage/index.tsx
@@ -1,5 +1,6 @@
 import MainLayout from "@components/layouts/MainLayout";
 import DoltLink from "@components/links/DoltLink";
+import DoltgresLink from "@components/links/DoltgresLink";
 import { QueryHandler } from "@dolthub/react-components";
 import {
   DatabaseConnectionFragment,
@@ -41,10 +42,8 @@ export default function ConfigurationPage() {
           <h1>Welcome to the Dolt Workbench</h1>
           <p>
             Connect the workbench to any MySQL or PostgreSQL compatible
-            database. Use <DoltLink />{" "}
-            {/* TODO(doltgres): Uncomment when ready */}
-            {/* or <DoltgresLink /> */}
-            to unlock version control features.
+            database. Use <DoltLink /> or <DoltgresLink /> to unlock version
+            control features.
           </p>
         </div>
         <QueryHandler

diff --git a/web/hooks/useDoltQueryBuilder/tests/testDataCommitDiff.ts b/web/hooks/useDoltQueryBuilder/tests/testDataCommitDiff.ts
@@ -1,7 +1,7 @@
+import { sprintf } from "@dolthub/web-utils";
 import { ColumnForDataTableFragment, CommitDiffType } from "@gen/graphql-types";
 import { fakeCommitId } from "@hooks/useCommitListForBranch/mocks";
 import { RequiredRefsParams, TableParams } from "@lib/params";
-import { sprintf } from "@lib/sprintf";
 import { Props } from "../useGetDoltCommitDiffQuery";
 import { maybeConvertToPG } from "./utils";
 

diff --git a/web/hooks/useDoltQueryBuilder/tests/testDataDiff.ts b/web/hooks/useDoltQueryBuilder/tests/testDataDiff.ts
@@ -1,9 +1,9 @@
+import { sprintf } from "@dolthub/web-utils";
 import {
   ColumnForDataTableFragment,
   RowForDataTableFragment,
 } from "@gen/graphql-types";
 import { TableParams } from "@lib/params";
-import { sprintf } from "@lib/sprintf";
 import { Props } from "../useGetDoltDiffQuery";
 import { maybeConvertToPG } from "./utils";
 

diff --git a/web/lib/sprintf.test.ts b/web/lib/sprintf.test.ts
diff --git a/web/lib/sprintf.ts b/web/lib/sprintf.ts
diff --git a/web/package.json b/web/package.json
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@apollo/client": "^3.9.9",
-    "@dolthub/react-components": "^0.2.3",
+    "@dolthub/react-components": "^0.2.4",
     "@dolthub/react-contexts": "^0.1.0",
     "@dolthub/react-hooks": "^0.1.7",
     "@dolthub/web-utils": "^0.1.8",