Graphql, Web: pull from and push to remotes

graphql-server/schema.gql

@@ -291,6 +291,17 @@ type RemoteList {
   list: [Remote!]!
 }
 
+type PullRes {
+  fastForward: String!
+  conflicts: String!
+  message: String!
+}
+
+type PushRes {
+  status: String!
+  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

@@ -393,14 +393,14 @@
   async restoreAllTables(args: t.RefArgs): t.PR {
     return this.queryQR(
       async qr => {
         console.log("[restore_all]: starting transaction");
         await qr.query("BEGIN");
 
         console.log("[restore_all]: calling");
         const res = await qr.query(qh.callResetHard);
 
         if (res.length && res[0].status !== "0") {
           console.log("[restore_all]: reset not successful, rolling back");
           await qr.query("ROLLBACK");
           throw new Error("Reset --hard not successful");
         }
@@ -410,12 +410,12 @@
 
         if (status.length) {
           status.forEach(async r => {
             console.log("[restore_all]: checking out new table", r.table_name);
             const checkRes = await qr.query(qh.callCheckoutTable, [
               r.table_name,
             ]);
             if (checkRes.length && checkRes[0].status !== "0") {
               console.log(
                 "[restore_all]: checkout not successful, rolling back",
               );
               await qr.query("ROLLBACK");
@@ -457,6 +457,22 @@
       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

@@ -25,6 +25,27 @@ export class RemoteList extends ListOffsetRes {
   list: Remote[];
 }
 
+@ObjectType()
+export class PullRes {
+  @Field()
+  fastForward: string;
+
+  @Field()
+  conflicts: string;
+
+  @Field()
+  message: string;
+}
+
+@ObjectType()
+export class PushRes {
+  @Field()
+  status: string;
+
+  @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,
+    conflicts: r.conflicts,
+    message: r.message,
+  };
+}
+
+export function fromPushRes(r: RawRow): PushRes {
+  return {
+    status: r.status,
+    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,18 @@ 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);
+    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);
+    return fromPushRes(res[0]);
+  }
 }

web/renderer/components/SqlDataTable/useSqlQuery.ts

@@ -6,7 +6,7 @@ import {
 import { useSessionQueryHistory } from "@dolthub/react-hooks";
 import useSqlParser from "@hooks/useSqlParser";
 import { SqlQueryParams } from "@lib/params";
-import { refetchSqlUpdateQueriesCacheEvict } from "@lib/refetchQueries";
+import { refetchUpdateDatabaseQueriesCacheEvict } from "@lib/refetchQueries";
 import { databases } from "@lib/urls";
 import { useRouter } from "next/router";
 import { useEffect } from "react";
@@ -33,7 +33,7 @@ export default function useSqlQuery(
     // time to finish
     setTimeout(() => {
       client
-        .refetchQueries(refetchSqlUpdateQueriesCacheEvict)
+        .refetchQueries(refetchUpdateDatabaseQueriesCacheEvict)
         .catch(console.error);
     }, 300);
   }, [gqlError, isMut, client]);

web/renderer/components/StatusWithOptions/ResetModal.tsx

@@ -6,7 +6,7 @@ import useSqlBuilder from "@hooks/useSqlBuilder";
 import { ModalProps } from "@lib/modalProps";
 import { RefParams } from "@lib/params";
 import { getPostgresTableName } from "@lib/postgres";
-import { refetchSqlUpdateQueriesCacheEvict } from "@lib/refetchQueries";
+import { refetchUpdateDatabaseQueriesCacheEvict } from "@lib/refetchQueries";
 import { sqlQuery } from "@lib/urls";
 import css from "./index.module.css";
 
@@ -27,7 +27,7 @@ export default function ResetModal(props: Props) {
       await mutateFn({ variables: props.params });
       props.setIsOpen(false);
       client
-        .refetchQueries(refetchSqlUpdateQueriesCacheEvict)
+        .refetchQueries(refetchUpdateDatabaseQueriesCacheEvict)
         .catch(console.error);
     } catch (_) {
       // Handled by useMutation

web/renderer/components/pageComponents/DatabasePage/ForRemotes/AddRemotePage/index.tsx

@@ -1,9 +1,9 @@
-import { DatabaseParams } from "@lib/params";
+import { OptionalRefParams } from "@lib/params";
 import AddRemoteForm from "./AddRemoteForm";
 import css from "./index.module.css";
 
 type Props = {
-  params: DatabaseParams;
+  params: OptionalRefParams;
 };
 
 export default function AddRemotePage(props: Props): JSX.Element {

web/renderer/components/pageComponents/DatabasePage/ForRemotes/RemotesPage/Inner.tsx

@@ -8,12 +8,12 @@ import { newRemote } from "@lib/urls";
 import { useState } from "react";
 import DeleteModal from "@components/DeleteModal";
 import { refetchRemoteQueries } from "@lib/refetchQueries";
-import { DatabaseParams } from "@lib/params";
+import { OptionalRefParams } from "@lib/params";
 import RemoteRow from "./RemoteRow";
 import css from "./index.module.css";
 
 type InnerProps = {
-  params: DatabaseParams;
+  params: OptionalRefParams;
   remotes: RemoteFragment[];
   loadMore: () => Promise<void>;
   hasMore: boolean;