Merge pull request #348 from dolthub/liuliu/pass-refname-on-pull-and-…

…push

Graphql, Web: use refname on pull and push

graphql-server/schema.gql

@@ -389,8 +389,8 @@ type Mutation {
   mergePull(fromBranchName: String!, toBranchName: String!, databaseName: String!, author: AuthorInfo): Boolean!
   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!
+  pullFromRemote(remoteName: String!, databaseName: String!, refName: String!, branchName: String!): PullRes!
+  pushToRemote(remoteName: String!, databaseName: String!, refName: 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

@@ -470,6 +470,7 @@ export class DoltQueryFactory
       qh.callPullRemote,
       [args.remoteName, args.branchName],
       args.databaseName,
+      args.refName,
     );
   }
 
@@ -478,6 +479,7 @@ export class DoltQueryFactory
       qh.callPushRemote,
       [args.remoteName, args.branchName],
       args.databaseName,
+      args.refName,
     );
   }
 

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

@@ -461,6 +461,7 @@ export class DoltgresQueryFactory
       qh.callPullRemote,
       [args.remoteName, args.branchName],
       args.databaseName,
+      args.refName,
     );
   }
 
@@ -469,6 +470,7 @@ export class DoltgresQueryFactory
       qh.callPushRemote,
       [args.remoteName, args.branchName],
       args.databaseName,
+      args.refName,
     );
   }
 

graphql-server/src/queryFactory/types.ts

@@ -9,7 +9,10 @@ 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 RemoteMaybeBranchArgs = RemoteArgs & { branchName?: string };
+export type RemoteMaybeBranchArgs = RemoteArgs & {
+  refName: string;
+  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.resolver.ts

@@ -29,6 +29,9 @@ export class AddRemoteArgs extends RemoteArgs {
 
 @ArgsType()
 export class PullOrPushRemoteArgs extends RemoteArgs {
+  @Field()
+  refName: string;
+
   @Field()
   branchName: string;
 }

web/package.json

@@ -2,7 +2,7 @@
   "private": true,
   "name": "dolt-workbench",
   "description": "SQL workbench for MySQL and PostgreSQL databases",
-  "version": "0.3.0",
+  "version": "0.3.6",
   "main": "app/background.js",
   "author": "DoltHub",
   "packageManager": "yarn@4.5.0",

web/renderer/components/pageComponents/DatabasePage/ForRemotes/RemotesPage/queries.ts

@@ -33,11 +33,13 @@ export const PULL_FROM_REMOTE = gql`
     $remoteName: String!
     $branchName: String!
     $databaseName: String!
+    $refName: String!
   ) {
     pullFromRemote(
       remoteName: $remoteName
       branchName: $branchName
       databaseName: $databaseName
+      refName: $refName
     ) {
       ...PullRes
     }
@@ -53,11 +55,13 @@ export const PUSH_TO_REMOTE = gql`
     $remoteName: String!
     $branchName: String!
     $databaseName: String!
+    $refName: String!
   ) {
     pushToRemote(
       remoteName: $remoteName
       branchName: $branchName
       databaseName: $databaseName
+      refName: $refName
     ) {
       ...PushRes
     }

web/renderer/components/pageComponents/DatabasePage/ForRemotes/RemotesPage/usePullFromRemote.ts

@@ -58,6 +58,7 @@ export default function usePullFromRemote(
         databaseName: params.databaseName,
         remoteName: remote.name,
         branchName: remoteBranchName,
+        refName: params.refName,
       },
     });
     if (!pullRes.data) return;

web/renderer/components/pageComponents/DatabasePage/ForRemotes/RemotesPage/usePushToRemote.ts

@@ -53,6 +53,7 @@ export default function usePushToRemote(
         branchName: remoteBranch
           ? `${state.branchName}:${remoteBranch}`
           : state.branchName,
+        refName: state.branchName,
       },
     });
     setState({ loading: false });

web/renderer/gen/graphql-types.tsx

@@ -333,13 +333,15 @@ export type MutationMergePullArgs = {
 export type MutationPullFromRemoteArgs = {
   branchName: Scalars['String']['input'];
   databaseName: Scalars['String']['input'];
+  refName: Scalars['String']['input'];
   remoteName: Scalars['String']['input'];
 };
 
 
 export type MutationPushToRemoteArgs = {
   branchName: Scalars['String']['input'];
   databaseName: Scalars['String']['input'];
+  refName: Scalars['String']['input'];
   remoteName: Scalars['String']['input'];
 };
 
@@ -1324,6 +1326,7 @@ export type PullFromRemoteMutationVariables = Exact<{
   remoteName: Scalars['String']['input'];
   branchName: Scalars['String']['input'];
   databaseName: Scalars['String']['input'];
+  refName: Scalars['String']['input'];
 }>;
 
 
@@ -1335,6 +1338,7 @@ export type PushToRemoteMutationVariables = Exact<{
   remoteName: Scalars['String']['input'];
   branchName: Scalars['String']['input'];
   databaseName: Scalars['String']['input'];
+  refName: Scalars['String']['input'];
 }>;
 
 
@@ -3902,11 +3906,12 @@ export type DeleteRemoteMutationHookResult = ReturnType<typeof useDeleteRemoteMu
 export type DeleteRemoteMutationResult = Apollo.MutationResult<DeleteRemoteMutation>;
 export type DeleteRemoteMutationOptions = Apollo.BaseMutationOptions<DeleteRemoteMutation, DeleteRemoteMutationVariables>;
 export const PullFromRemoteDocument = gql`
-    mutation PullFromRemote($remoteName: String!, $branchName: String!, $databaseName: String!) {
+    mutation PullFromRemote($remoteName: String!, $branchName: String!, $databaseName: String!, $refName: String!) {
   pullFromRemote(
     remoteName: $remoteName
     branchName: $branchName
     databaseName: $databaseName
+    refName: $refName
   ) {
     ...PullRes
   }
@@ -3930,6 +3935,7 @@ export type PullFromRemoteMutationFn = Apollo.MutationFunction<PullFromRemoteMut
  *      remoteName: // value for 'remoteName'
  *      branchName: // value for 'branchName'
  *      databaseName: // value for 'databaseName'
+ *      refName: // value for 'refName'
  *   },
  * });
  */
@@ -3941,11 +3947,12 @@ export type PullFromRemoteMutationHookResult = ReturnType<typeof usePullFromRemo
 export type PullFromRemoteMutationResult = Apollo.MutationResult<PullFromRemoteMutation>;
 export type PullFromRemoteMutationOptions = Apollo.BaseMutationOptions<PullFromRemoteMutation, PullFromRemoteMutationVariables>;
 export const PushToRemoteDocument = gql`
-    mutation PushToRemote($remoteName: String!, $branchName: String!, $databaseName: String!) {
+    mutation PushToRemote($remoteName: String!, $branchName: String!, $databaseName: String!, $refName: String!) {
   pushToRemote(
     remoteName: $remoteName
     branchName: $branchName
     databaseName: $databaseName
+    refName: $refName
   ) {
     ...PushRes
   }
@@ -3969,6 +3976,7 @@ export type PushToRemoteMutationFn = Apollo.MutationFunction<PushToRemoteMutatio
  *      remoteName: // value for 'remoteName'
  *      branchName: // value for 'branchName'
  *      databaseName: // value for 'databaseName'
+ *      refName: // value for 'refName'
  *   },
  * });
  */