Merge pull request #315 from dolthub/liuliu/pull-and-push

Graphql, Web: pull from and push to remotes

Author: liuliu-dev

graphql-server/schema.gql

@@ -291,6 +291,17 @@ type RemoteList {
   list: [Remote!]!
 }
 
+type PullRes {
+  fastForward: Boolean!
+  conflicts: Int!
+  message: String!
+}
+
+type PushRes {
+  success: Boolean!
+  message: String!
+}
+
 type Query {
   branch(databaseName: String!, branchName: String!): Branch
   branchOrDefault(databaseName: String!, branchName: String): Branch
@@ -361,8 +372,10 @@ type Mutation {
   resetDatabase(newDatabase: 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!
-  addRemote(databaseName: String!, remoteName: String!, remoteUrl: String!): String!
+  addRemote(remoteName: String!, databaseName: String!, remoteUrl: String!): String!
   deleteRemote(databaseName: String!, remoteName: String!): Boolean!
+  pullFromRemote(remoteName: String!, databaseName: String!, branchName: String!): PullRes!
+  pushToRemote(remoteName: String!, databaseName: String!, branchName: String!): PushRes!
   restoreAllTables(databaseName: String!, refName: String!): Boolean!
   createTag(tagName: String!, databaseName: String!, message: String, fromRefName: String!, author: AuthorInfo): String!
   deleteTag(databaseName: String!, tagName: String!): Boolean!

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

@@ -457,6 +457,22 @@ export class DoltQueryFactory
       args.databaseName,
     );
   }
+
+  async callPullRemote(args: t.PushOrPullRemoteArgs): t.PR {
+    return this.query(
+      qh.callPullRemote,
+      [args.remoteName, args.branchName],
+      args.databaseName,
+    );
+  }
+
+  async callPushRemote(args: t.PushOrPullRemoteArgs): t.PR {
+    return this.query(
+      qh.callPushRemote,
+      [args.remoteName, args.branchName],
+      args.databaseName,
+    );
+  }
 }
 
 async function getTableInfoWithQR(

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

@@ -80,6 +80,10 @@ export const callAddRemote = `CALL DOLT_REMOTE("add", ?, ?)`;
 
 export const callDeleteRemote = `CALL DOLT_REMOTE("remove", ?)`;
 
+export const callPullRemote = `CALL DOLT_PULL(?, ?)`;
+
+export const callPushRemote = `CALL DOLT_PUSH(?, ?)`;
+
 // TAGS
 
 export const callDeleteTag = `CALL DOLT_TAG("-d", ?)`;

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

@@ -448,6 +448,22 @@ export class DoltgresQueryFactory
       args.databaseName,
     );
   }
+
+  async callPullRemote(args: t.PushOrPullRemoteArgs): t.PR {
+    return this.query(
+      qh.callPullRemote,
+      [args.remoteName, args.branchName],
+      args.databaseName,
+    );
+  }
+
+  async callPushRemote(args: t.PushOrPullRemoteArgs): t.PR {
+    return this.query(
+      qh.callPushRemote,
+      [args.remoteName, args.branchName],
+      args.databaseName,
+    );
+  }
 }
 
 async function getTableInfoWithQR(

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

@@ -166,3 +166,7 @@ export const callCheckoutTable = `SELECT DOLT_CHECKOUT($1::text)`;
 export const callAddRemote = `SELECT DOLT_REMOTE('add', $1::text, $2::text)`;
 
 export const callDeleteRemote = `SELECT DOLT_REMOTE('remove', $1::text)`;
+
+export const callPullRemote = `SELECT DOLT_PULL($1::text, $2::text)`;
+
+export const callPushRemote = `SELECT DOLT_PUSH($1::text, $2::text)`;

graphql-server/src/queryFactory/index.ts

@@ -150,4 +150,8 @@ export declare class QueryFactory {
   addRemote(args: t.AddRemoteArgs): t.PR;
 
   callDeleteRemote(args: t.RemoteArgs): t.PR;
+
+  callPullRemote(args: t.PushOrPullRemoteArgs): t.PR;
+
+  callPushRemote(args: t.PushOrPullRemoteArgs): t.PR;
 }

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

@@ -313,4 +313,12 @@ export class MySQLQueryFactory
   async callDeleteRemote(_: t.RemoteArgs): t.PR {
     throw notDoltError("delete remote");
   }
+
+  async callPullRemote(_: t.PushOrPullRemoteArgs): t.PR {
+    throw notDoltError("pull remote");
+  }
+
+  async callPushRemote(_: t.PushOrPullRemoteArgs): t.PR {
+    throw notDoltError("push remote");
+  }
 }

graphql-server/src/queryFactory/types.ts

@@ -9,6 +9,7 @@ export type RefMaybeSchemaArgs = RefArgs & { schemaName?: string };
 export type BranchArgs = DBArgs & { branchName: string };
 export type RemoteArgs = DBArgs & { remoteName: string };
 export type AddRemoteArgs = RemoteArgs & { remoteUrl: string };
+export type PushOrPullRemoteArgs = RemoteArgs & { branchName?: string };
 export type TagArgs = DBArgs & { tagName: string };
 export type TableArgs = RefArgs & { tableName: string };
 export type TableMaybeSchemaArgs = TableArgs & { schemaName?: string };

graphql-server/src/remotes/remote.model.ts

@@ -1,4 +1,4 @@
-import { Field, ID, ObjectType } from "@nestjs/graphql";
+import { Field, ID, Int, ObjectType } from "@nestjs/graphql";
 import { __Type } from "graphql";
 import { getNextOffset, ROW_LIMIT } from "../utils";
 import { RawRow } from "../queryFactory/types";
@@ -25,6 +25,27 @@ export class RemoteList extends ListOffsetRes {
   list: Remote[];
 }
 
+@ObjectType()
+export class PullRes {
+  @Field()
+  fastForward: boolean;
+
+  @Field(_type => Int)
+  conflicts: number;
+
+  @Field()
+  message: string;
+}
+
+@ObjectType()
+export class PushRes {
+  @Field()
+  success: boolean;
+
+  @Field()
+  message: string;
+}
+
 export function fromDoltRemotesRow(databaseName: string, r: RawRow): Remote {
   return {
     _id: `databases/${databaseName}/remotes/${r.name}`,
@@ -45,3 +66,18 @@ export function getRemoteListRes(
     nextOffset: getNextOffset(remotes.length, args.offset ?? 0),
   };
 }
+
+export function fromPullRes(r: RawRow): PullRes {
+  return {
+    fastForward: r.fast_forward === "1",
+    conflicts: parseInt(r.conflicts, 10),
+    message: r.message,
+  };
+}
+
+export function fromPushRes(r: RawRow): PushRes {
+  return {
+    success: r.status === "0",
+    message: r.message,
+  };
+}

graphql-server/src/remotes/remote.resolver.ts

@@ -7,16 +7,27 @@ import {
   Resolver,
 } from "@nestjs/graphql";
 import { ConnectionProvider } from "../connections/connection.provider";
-import { DBArgs, DBArgsWithOffset, RemoteArgs } from "../utils/commonTypes";
-import { getRemoteListRes, Remote, RemoteList } from "./remote.model";
+import { DBArgsWithOffset, RemoteArgs } from "../utils/commonTypes";
+import {
+  fromPullRes,
+  fromPushRes,
+  getRemoteListRes,
+  PullRes,
+  PushRes,
+  Remote,
+  RemoteList,
+} from "./remote.model";
 
 @ArgsType()
-export class AddRemoteArgs extends DBArgs {
+export class AddRemoteArgs extends RemoteArgs {
   @Field()
-  remoteName: string;
+  remoteUrl: string;
+}
 
+@ArgsType()
+export class PullOrPushRemoteArgs extends RemoteArgs {
   @Field()
-  remoteUrl: string;
+  branchName: string;
 }
 
 @Resolver(_of => Remote)
@@ -44,4 +55,24 @@ export class RemoteResolver {
     await conn.callDeleteRemote(args);
     return true;
   }
+
+  @Mutation(_returns => PullRes)
+  async pullFromRemote(@Args() args: PullOrPushRemoteArgs): Promise<PullRes> {
+    const conn = this.conn.connection();
+    const res = await conn.callPullRemote(args);
+    if (res.length === 0) {
+      throw new Error("No response from pull");
+    }
+    return fromPullRes(res[0]);
+  }
+
+  @Mutation(_returns => PushRes)
+  async pushToRemote(@Args() args: PullOrPushRemoteArgs): Promise<PushRes> {
+    const conn = this.conn.connection();
+    const res = await conn.callPushRemote(args);
+    if (res.length === 0) {
+      throw new Error("No response from push");
+    }
+    return fromPushRes(res[0]);
+  }
 }