Merge pull request #163 from dolthub/taylor/issue-162

Fix some connection/branch bugs

Author: tbantle22

graphql-server/src/branches/branch.resolver.ts

@@ -61,8 +61,8 @@ export class BranchResolver {
   async branch(@Args() args: BranchArgs): Promise<Branch | undefined> {
     const conn = this.conn.connection();
     const res = await conn.getBranch(args);
-    if (!res?.length) return undefined;
-    return fromDoltBranchesRow(args.databaseName, res[0]);
+    if (!res) return undefined;
+    return fromDoltBranchesRow(args.databaseName, res);
   }
 
   @Query(_returns => Branch, { nullable: true })

graphql-server/src/connections/connection.resolver.ts

@@ -43,9 +43,11 @@ export class ConnectionResolver {
 
     const options: mysql.ConnectionOptions = {
       uri: workbenchConfig.connectionUrl,
-      ssl: {
-        rejectUnauthorized: false,
-      },
+      ssl: workbenchConfig.useSSL
+        ? {
+            rejectUnauthorized: false,
+          }
+        : undefined,
       connectionLimit: 1,
       dateStrings: ["DATE"],
 

graphql-server/src/databases/database.resolver.ts

@@ -140,14 +140,14 @@ export class DatabaseResolver {
 
     const storeArgs = { ...workbenchConfig, name: args.name };
 
+    await this.conn.addConnection(workbenchConfig);
+
     if (this.dataStoreService.hasDataStoreConfig()) {
       await this.dataStoreService.addStoredConnection(storeArgs);
     } else {
       this.fileStoreService.addItemToStore(storeArgs);
     }
 
-    await this.conn.addConnection(workbenchConfig);
-
     const db = await this.currentDatabase();
     if (type === DatabaseType.Mysql) {
       return { currentDatabase: db };

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

@@ -322,7 +322,7 @@ export class DoltQueryFactory
           .createQueryBuilder()
           .select("*")
           .from("dolt_tags", "")
-          .where("dolt_tags.tag_name", { tag_name: args.tagName })
+          .where("dolt_tags.tag_name = :name", { name: args.tagName })
           .getRawOne(),
       args.databaseName,
     );

graphql-server/src/tags/tag.resolver.ts

@@ -48,8 +48,8 @@ export class TagResolver {
   async tag(@Args() args: TagArgs): Promise<Tag | undefined> {
     const conn = this.conn.connection();
     const res = await conn.getTag(args);
-    if (!res?.length) return undefined;
-    return fromDoltRowRes(args.databaseName, res[0]);
+    if (!res) return undefined;
+    return fromDoltRowRes(args.databaseName, res);
   }
 
   @Mutation(_returns => String)

web/components/DatabaseNav/useGetRefParams.ts

@@ -1,11 +1,11 @@
-import { useGetBranchForPullQuery, useGetTagQuery } from "@gen/graphql-types";
+import { useGetBranchQuery, useGetTagQuery } from "@gen/graphql-types";
 import useDefaultBranch from "@hooks/useDefaultBranch";
 import { RefParams } from "@lib/params";
 
 export default function useGetRefParams(params: RefParams) {
   const { defaultBranchName } = useDefaultBranch(params);
 
-  const checkBranchExistRes = useGetBranchForPullQuery({
+  const checkBranchExistRes = useGetBranchQuery({
     variables: {
       databaseName: params.databaseName,
       branchName: params.refName,

web/components/pageComponents/DatabasePage/ForReleases/NewReleasePage/NewReleaseForm/index.test.tsx

@@ -37,7 +37,14 @@ describe("tests NewTagForm", () => {
       </MockedProvider>,
     );
 
+    expect(
+      screen.getByText("Pick a branch or recent commit"),
+    ).toBeInTheDocument();
     await user.click(await screen.findByRole("combobox"));
+    expect(
+      await screen.findByText(mocks.fromBranch.branchName),
+    ).toBeInTheDocument();
+
     await selectEvent.select(
       screen.getByRole("combobox"),
       mocks.fromBranch.branchName,
@@ -77,7 +84,7 @@ describe("tests NewTagForm", () => {
         name: /cancel/i,
       }),
     ).toBeInTheDocument();
-  });
+  }, 8000);
 
   it("creates a new tag", async () => {
     const user = await fillTagForm();