Merge pull request #630 from dolthub/eric/dolt-test

Add dolt_tests to workbench

Author: eric-richardson1

graphql-server/schema.gql

@@ -339,6 +339,37 @@ type TagList {
   list: [Tag!]!
 }
 
+type Test {
+  _id: ID!
+  databaseName: String!
+  refName: String!
+  testName: String!
+  testGroup: String!
+  testQuery: String!
+  assertionType: String!
+  assertionComparator: String!
+  assertionValue: String!
+}
+
+type TestList {
+  list: [Test!]!
+}
+
+type TestResult {
+  _id: ID!
+  databaseName: String!
+  refName: String!
+  testName: String!
+  testGroupName: String
+  query: String!
+  status: String!
+  message: String!
+}
+
+type TestResultList {
+  list: [TestResult!]!
+}
+
 type Query {
   branch(databaseName: String!, branchName: String!): Branch
   branchOrDefault(databaseName: String!, branchName: String): Branch
@@ -378,6 +409,8 @@ type Query {
   tables(schemaName: String, refName: String!, databaseName: String!, filterSystemTables: Boolean): [Table!]!
   tags(databaseName: String!): TagList!
   tag(databaseName: String!, tagName: String!): Tag
+  tests(databaseName: String!, refName: String!): TestList!
+  runTests(refName: String!, databaseName: String!, testIdentifier: TestIdentifierArgs): TestResultList!
 }
 
 enum SortBranchesBy {
@@ -405,6 +438,11 @@ enum DiffRowType {
   All
 }
 
+input TestIdentifierArgs {
+  testName: String
+  groupName: String
+}
+
 type Mutation {
   createBranch(databaseName: String!, newBranchName: String!, fromRefName: String!): String!
   deleteBranch(databaseName: String!, branchName: String!): Boolean!
@@ -426,6 +464,7 @@ type Mutation {
   restoreAllTables(databaseName: String!, refName: String!): Boolean!
   createTag(tagName: String!, databaseName: String!, message: String, fromRefName: String!, author: AuthorInfo): String!
   deleteTag(databaseName: String!, tagName: String!): Boolean!
+  saveTests(refName: String!, databaseName: String!, tests: TestListArgs!): TestList!
 }
 
 enum ImportOperation {
@@ -449,4 +488,17 @@ enum LoadDataModifier {
 input AuthorInfo {
   name: String!
   email: String!
+}
+
+input TestListArgs {
+  list: [TestArgs!]!
+}
+
+input TestArgs {
+  testName: String!
+  testGroup: String!
+  testQuery: String!
+  assertionType: String!
+  assertionComparator: String!
+  assertionValue: String!
 }

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

@@ -1,11 +1,12 @@
-import { EntityManager } from "typeorm";
+import { EntityManager, InsertResult } from "typeorm";
 import { SchemaType } from "../../schemas/schema.enums";
 import { SchemaItem } from "../../schemas/schema.model";
 import { DoltSystemTable } from "../../systemTables/systemTable.enums";
 import { ROW_LIMIT, handleTableNotFound } from "../../utils";
 import { tableWithSchema } from "../postgres/utils";
 import * as t from "../types";
 import { getOrderByColForBranches } from "./queries";
+import { TestArgs } from "../types";
 
 export async function getDoltSchemas(
   em: EntityManager,
@@ -184,3 +185,42 @@ export async function getDoltRemotesPaginated(
     .limit(ROW_LIMIT + 1)
     .getRawMany();
 }
+
+export async function getDoltTests(em: EntityManager): t.PR {
+  return em
+    .createQueryBuilder()
+    .select("*")
+    .from("dolt_tests", "")
+    .getRawMany();
+}
+
+export async function saveDoltTests(
+  em: EntityManager,
+  tests: TestArgs[],
+): Promise<InsertResult> {
+  return em.transaction(async transactionalEntityManager => {
+    await transactionalEntityManager
+      .createQueryBuilder()
+      .delete()
+      .from("dolt_tests")
+      .execute();
+
+    return transactionalEntityManager
+      .createQueryBuilder()
+      .insert()
+      .into("dolt_tests")
+      .values(
+        tests.map(t => {
+          return {
+            test_name: t.testName,
+            test_group: t.testGroup,
+            test_query: t.testQuery,
+            assertion_type: t.assertionType,
+            assertion_comparator: t.assertionComparator,
+            assertion_value: t.assertionValue,
+          };
+        }),
+      )
+      .execute();
+  });
+}

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

@@ -16,6 +16,7 @@ import * as t from "../types";
 import * as dem from "./doltEntityManager";
 import * as qh from "./queries";
 import { getAuthorString, handleRefNotFound, unionCols } from "./utils";
+import { InsertResult } from "typeorm";
 
 export class DoltQueryFactory
   extends MySQLQueryFactory
@@ -584,6 +585,38 @@ export class DoltQueryFactory
       qr.query(qh.callDoltClone, [args.remoteDbPath, args.databaseName]),
     );
   }
+
+  async getTests(args: t.RefArgs): t.PR {
+    return this.queryForBuilder(
+      async em => dem.getDoltTests(em),
+      args.databaseName,
+      args.refName,
+    );
+  }
+
+  async runTests(args: t.RunTestsArgs): t.PR {
+    const withTestIdentifierArg =
+      args.testIdentifier &&
+      (args.testIdentifier.testName !== undefined ||
+        args.testIdentifier.groupName !== undefined);
+
+    return this.query(
+      qh.doltTestRun(withTestIdentifierArg),
+      withTestIdentifierArg
+        ? [args.testIdentifier?.testName ?? args.testIdentifier?.groupName]
+        : undefined,
+      args.databaseName,
+      args.refName,
+    );
+  }
+
+  async saveTests(args: t.SaveTestsArgs): Promise<InsertResult> {
+    return this.queryForBuilder(
+      async em => dem.saveDoltTests(em, args.tests.list),
+      args.databaseName,
+      args.refName,
+    );
+  }
 }
 
 async function getTableInfoWithQR(

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

@@ -181,3 +181,6 @@ export const callResetHard = `CALL DOLT_RESET("--hard")`;
 export const callCheckoutTable = `CALL DOLT_CHECKOUT(?)`;
 
 export const callDoltClone = `CALL DOLT_CLONE(?,?)`;
+
+export const doltTestRun = (withArg?: boolean): string =>
+  `SELECT * FROM DOLT_TEST_RUN(${withArg ? "?" : ""})`;

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

@@ -1,4 +1,4 @@
-import { QueryRunner } from "typeorm";
+import { InsertResult, QueryRunner } from "typeorm";
 import { QueryFactory } from "..";
 import * as column from "../../columns/column.model";
 import { CommitDiffType } from "../../diffSummaries/diffSummary.enums";
@@ -559,6 +559,38 @@ export class DoltgresQueryFactory
       args.databaseName,
     );
   }
+
+  async getTests(args: t.RefArgs): t.PR {
+    return this.queryForBuilder(
+      async em => dem.getDoltTests(em),
+      args.databaseName,
+      args.refName,
+    );
+  }
+
+  async runTests(args: t.RunTestsArgs): t.PR {
+    const withTestIdentifierArg =
+      args.testIdentifier &&
+      (args.testIdentifier.testName !== undefined ||
+        args.testIdentifier.groupName !== undefined);
+
+    return this.query(
+      qh.doltTestRun(withTestIdentifierArg),
+      withTestIdentifierArg
+        ? [args.testIdentifier?.testName ?? args.testIdentifier?.groupName]
+        : undefined,
+      args.databaseName,
+      args.refName,
+    );
+  }
+
+  async saveTests(args: t.SaveTestsArgs): Promise<InsertResult> {
+    return this.queryForBuilder(
+      async em => dem.saveDoltTests(em, args.tests.list),
+      args.databaseName,
+      args.refName,
+    );
+  }
 }
 
 async function getTableInfoWithQR(

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

@@ -192,3 +192,6 @@ export const callPushRemote = `SELECT DOLT_PUSH($1::text, $2::text)`;
 export const callFetchRemote = `SELECT DOLT_FETCH($1::text)`;
 
 export const callCreateBranchFromRemote = `CALL DOLT_BRANCH($1::text, $2::text)`;
+
+export const doltTestRun = (withArg?: boolean): string =>
+  `SELECT * FROM DOLT_TEST_RUN(${withArg ? "$1::text" : ""})`;

graphql-server/src/queryFactory/index.ts

@@ -1,4 +1,4 @@
-import { DataSource, EntityManager, QueryRunner } from "typeorm";
+import { DataSource, EntityManager, InsertResult, QueryRunner } from "typeorm";
 import { CommitDiffType } from "../diffSummaries/diffSummary.enums";
 import { SchemaType } from "../schemas/schema.enums";
 import { SchemaItem } from "../schemas/schema.model";
@@ -180,4 +180,10 @@ export declare class QueryFactory {
   callCreateBranchFromRemote(args: t.RemoteArgs): t.PR;
 
   getMergeBase(args: t.RefsArgs): Promise<string>;
+
+  getTests(args: t.RefArgs): t.PR;
+
+  runTests(args: t.RunTestsArgs): t.PR;
+
+  saveTests(args: t.SaveTestsArgs): Promise<InsertResult>;
 }

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

@@ -1,4 +1,4 @@
-import { EntityManager, QueryRunner } from "typeorm";
+import { EntityManager, InsertResult, QueryRunner } from "typeorm";
 import { QueryFactory } from "..";
 import { SchemaType } from "../../schemas/schema.enums";
 import { SchemaItem } from "../../schemas/schema.model";
@@ -367,4 +367,16 @@ export class MySQLQueryFactory
   async callCreateBranchFromRemote(_: t.RemoteBranchArgs): t.PR {
     throw notDoltError("create branch from remote");
   }
+
+  async getTests(_: t.RefArgs): t.PR {
+    throw notDoltError("get tests");
+  }
+
+  async runTests(_: t.RefArgs): t.PR {
+    throw notDoltError("run tests");
+  }
+
+  async saveTests(_: t.SaveTestsArgs): Promise<InsertResult> {
+    throw notDoltError("save tests");
+  }
 }

graphql-server/src/queryFactory/types.ts

@@ -68,3 +68,28 @@ export type TableRowPagination = { pkCols: string[]; offset: number };
 export type DiffRes = Promise<{ colsUnion: RawRows; diff: RawRows }>;
 export type CommitsRes = Promise<{ fromCommitId: string; toCommitId: string }>;
 export type CommitAuthor = { name: string; email: string };
+
+export type TestArgs = {
+  testName: string;
+  testGroup: string;
+  testQuery: string;
+  assertionType: string;
+  assertionComparator: string;
+  assertionValue: string;
+};
+
+export type TestListArgs = {
+  list: TestArgs[];
+};
+export type SaveTestsArgs = RefArgs & {
+  tests: TestListArgs;
+};
+
+export type TestIdentifierArgs = {
+  testName?: string;
+  groupName?: string;
+};
+
+export type RunTestsArgs = RefArgs & {
+  testIdentifier?: TestIdentifierArgs;
+};

graphql-server/src/resolvers.ts

@@ -16,6 +16,7 @@ import { StatusResolver } from "./status/status.resolver";
 import { TableResolver } from "./tables/table.resolver";
 import { FileUploadResolver } from "./tables/upload.resolver";
 import { TagResolver } from "./tags/tag.resolver";
+import { TestResolver } from "./tests/test.resolver";
 
 const resolvers = [
   BranchResolver,
@@ -36,6 +37,7 @@ const resolvers = [
   StatusResolver,
   TableResolver,
   TagResolver,
+  TestResolver,
 ];
 
 export default resolvers;