web,graphql: Table-specific conflicts resolve

Author: tbantle22

graphql-server/schema.gql

@@ -416,7 +416,7 @@ type Mutation {
   doltClone(databaseName: String!, ownerName: String!, remoteDbName: String!): Boolean!
   loadDataFile(schemaName: String, tableName: String!, refName: String!, databaseName: String!, importOp: ImportOperation!, fileType: FileType!, file: Upload!, modifier: LoadDataModifier): Boolean!
   mergePull(fromBranchName: String!, toBranchName: String!, databaseName: String!, author: AuthorInfo): Boolean!
-  mergeAndResolveConflicts(author: AuthorInfo, fromBranchName: String!, toBranchName: String!, databaseName: String!, conflictResolveType: ConflictResolveType!): Boolean!
+  mergeAndResolveConflicts(author: AuthorInfo, fromBranchName: String!, toBranchName: String!, databaseName: String!, resolveOursTables: [String!]!, resolveTheirsTables: [String!]!): Boolean!
   addRemote(remoteName: String!, databaseName: String!, remoteUrl: String!): String!
   deleteRemote(databaseName: String!, remoteName: String!): Boolean!
   pullFromRemote(remoteName: String!, databaseName: String!, refName: String!, branchName: String!): PullRes!
@@ -449,9 +449,4 @@ enum LoadDataModifier {
 input AuthorInfo {
   name: String!
   email: String!
-}
-
-enum ConflictResolveType {
-  Ours
-  Theirs
 }

graphql-server/src/pulls/pull.enums.ts

@@ -7,10 +7,3 @@ export enum PullState {
 }
 
 registerEnumType(PullState, { name: "PullState" });
-
-export enum ConflictResolveType {
-  Ours = "ours",
-  Theirs = "theirs",
-}
-
-registerEnumType(ConflictResolveType, { name: "ConflictResolveType" });

graphql-server/src/pulls/pull.resolver.ts

@@ -9,7 +9,6 @@ import {
 import { CommitResolver } from "../commits/commit.resolver";
 import { ConnectionProvider } from "../connections/connection.provider";
 import { AuthorInfo, PullArgs } from "../utils/commonTypes";
-import { ConflictResolveType } from "./pull.enums";
 import { PullWithDetails, fromAPIModelPullWithDetails } from "./pull.model";
 
 @ArgsType()
@@ -20,8 +19,11 @@ class MergePullArgs extends PullArgs {
 
 @ArgsType()
 class MergeAndResolveArgs extends MergePullArgs {
-  @Field(_type => ConflictResolveType)
-  conflictResolveType: ConflictResolveType;
+  @Field(_type => [String])
+  resolveOursTables: string[];
+
+  @Field(_type => [String])
+  resolveTheirsTables: string[];
 }
 
 @Resolver(_of => PullWithDetails)
@@ -66,7 +68,8 @@ export class PullResolver {
       fromBranchName: args.fromBranchName,
       toBranchName: args.toBranchName,
       author: args.author,
-      conflictResolveType: args.conflictResolveType,
+      theirsTables: args.resolveTheirsTables,
+      oursTables: args.resolveOursTables,
     });
     return true;
   }

graphql-server/src/queryFactory/dolt/index.ts

@@ -329,7 +329,8 @@ export class DoltQueryFactory
   async callMergeWithResolveConflicts(
     args: t.BranchesArgs & {
       author?: t.CommitAuthor;
-      conflictResolveType: string;
+      oursTables: string[];
+      theirsTables: string[];
     },
   ): Promise<boolean> {
     return this.queryMultiple(
@@ -348,7 +349,18 @@ export class DoltQueryFactory
         ]);
 
         if (res.length && res[0].conflicts !== "0") {
-          await query(qh.resolveConflicts, [`--${args.conflictResolveType}`]);
+          if (args.oursTables.length) {
+            await query(qh.getResolveConflicts(args.oursTables.length), [
+              "--ours",
+              ...args.oursTables,
+            ]);
+          }
+          if (args.theirsTables.length) {
+            await query(qh.getResolveConflicts(args.theirsTables.length), [
+              "--theirs",
+              ...args.theirsTables,
+            ]);
+          }
           await query(qh.getCommitMerge(!!args.author), params);
         } else {
           await query("ROLLBACK");

graphql-server/src/queryFactory/dolt/queries.ts

@@ -87,7 +87,11 @@ export const mergeConflictsSummaryQuery = `SELECT * FROM DOLT_PREVIEW_MERGE_CONF
 
 export const mergeConflictsQuery = `SELECT * FROM DOLT_PREVIEW_MERGE_CONFLICTS(?, ?, ?) LIMIT ? OFFSET ?`;
 
-export const resolveConflicts = `CALL DOLT_CONFLICTS_RESOLVE(?, '.')`;
+export const getResolveConflicts = (numTables: number) =>
+  `CALL DOLT_CONFLICTS_RESOLVE(?, ${Array.from(
+    { length: numTables },
+    () => `?`,
+  ).join(", ")})`;
 
 export const getCommitMerge = (hasAuthor = false) =>
   `CALL DOLT_COMMIT("-Am", ?${getAuthorNameString(hasAuthor)})`;

graphql-server/src/queryFactory/doltgres/index.ts

@@ -336,16 +336,18 @@ export class DoltgresQueryFactory
     );
   }
 
+  // TODO: The dolt_conflicts_resolve function does not work in doltgres yet
   async callMergeWithResolveConflicts(
     args: t.BranchesArgs & {
       author?: t.CommitAuthor;
-      conflictResolveType: string;
+      oursTables: string[];
+      theirsTables: string[];
     },
   ): Promise<boolean> {
     return this.queryMultiple(
       async query => {
-        await query("BEGIN");
         // await query("SET autocommit off");
+        await query("BEGIN");
 
         const msg = `Merge branch ${args.fromBranchName}`;
         const params = [msg];
@@ -358,7 +360,18 @@ export class DoltgresQueryFactory
         ]);
 
         if (res.length && res[0].conflicts !== "0") {
-          await query(qh.resolveConflicts, [`--${args.conflictResolveType}`]);
+          if (args.oursTables.length) {
+            await query(qh.getResolveConflicts(args.oursTables.length), [
+              "--ours",
+              ...args.oursTables.map(tableWithoutSchema),
+            ]);
+          }
+          if (args.theirsTables.length) {
+            await query(qh.getResolveConflicts(args.theirsTables.length), [
+              "--theirs",
+              ...args.theirsTables.map(tableWithoutSchema),
+            ]);
+          }
           await query(qh.getCommitMerge(!!args.author), params);
         } else {
           await query("ROLLBACK");

graphql-server/src/queryFactory/doltgres/queries.ts

@@ -95,7 +95,11 @@ export const mergeConflictsSummaryQuery = `SELECT * FROM DOLT_PREVIEW_MERGE_CONF
 export const getMergeConflictsQuery = (offset: number) =>
   `SELECT * FROM DOLT_PREVIEW_MERGE_CONFLICTS($1::text, $2::text, $3::text) LIMIT ${ROW_LIMIT + 1} OFFSET ${offset}`;
 
-export const resolveConflicts = `SELECT DOLT_CONFLICTS_RESOLVE($1::text, '.')`;
+export const getResolveConflicts = (numTables: number) =>
+  `SELECT DOLT_CONFLICTS_RESOLVE($1::text, ${Array.from(
+    { length: numTables },
+    (_, i) => `$${i + 2}::text`,
+  ).join(", ")})`;
 
 export const getCommitMerge = (hasAuthor = false) =>
   `CALL DOLT_COMMIT("-Am", $1::text${getAuthorNameString(hasAuthor, "$2::text")})`;

graphql-server/src/queryFactory/index.ts

@@ -142,7 +142,8 @@ export declare class QueryFactory {
   callMergeWithResolveConflicts(
     args: t.BranchesArgs & {
       author?: t.CommitAuthor;
-      conflictResolveType: string;
+      oursTables: string[];
+      theirsTables: string[];
     },
   ): Promise<boolean>;
 

web/renderer/components/pageComponents/DatabasePage/ForPulls/PullActions/Merge/ResolveModal.tsx

@@ -0,0 +1,27 @@
+.modal {
+  @apply text-primary;
+
+  p {
+    @apply my-3;
+  }
+
+  h3 {
+    @apply my-0;
+  }
+}
+
+.tableResolve {
+  @apply flex;
+}
+
+.tableName {
+  @apply font-semibold w-36;
+}
+
+.radios {
+  @apply flex;
+}
+
+.radio {
+  @apply mr-8;
+}