Merge pull request #224 from dolthub/taylor/dg-support

web,graphql: Progress on doltgres support

README.md

@@ -1,8 +1,9 @@
 # dolt-workbench
 
 A modern, browser-based, open source SQL workbench for your MySQL and PostgreSQL
-compatible databases. Use [Dolt](https://doltdb.com) to unlock powerful version control
-features. [Doltgres](https://github.com/dolthub/doltgresql) support coming soon.
+compatible databases. Use [Dolt](https://doltdb.com) or
+[Doltgres](https://github.com/dolthub/doltgresql) to unlock powerful version control
+features.
 
 ## Installation
 

graphql-server/schema.gql

@@ -101,7 +101,6 @@ type DatabaseConnection {
   hideDoltFeatures: Boolean
   useSSL: Boolean
   type: DatabaseType
-  schema: String
   isDolt: Boolean
 }
 
@@ -118,7 +117,6 @@ type DoltDatabaseDetails {
 
 type CurrentDatabaseState {
   currentDatabase: String
-  currentSchema: String
 }
 
 type DiffStat {
@@ -291,7 +289,7 @@ type Query {
   currentDatabase: String
   storedConnections: [DatabaseConnection!]!
   databases: [String!]!
-  schemas(databaseName: String!): [String!]!
+  schemas(databaseName: String!, refName: String!): [String!]!
   doltDatabaseDetails: DoltDatabaseDetails!
   diffStat(databaseName: String!, fromRefName: String!, toRefName: String!, refName: String, type: CommitDiffType, tableName: String): DiffStat!
   diffSummaries(databaseName: String!, fromRefName: String!, toRefName: String!, refName: String, type: CommitDiffType, tableName: String): [DiffSummary!]!
@@ -341,10 +339,10 @@ enum DiffRowType {
 type Mutation {
   createBranch(databaseName: String!, newBranchName: String!, fromRefName: String!): String!
   deleteBranch(databaseName: String!, branchName: String!): Boolean!
-  addDatabaseConnection(connectionUrl: String!, name: String!, hideDoltFeatures: Boolean, useSSL: Boolean, type: DatabaseType, schema: String): CurrentDatabaseState!
+  addDatabaseConnection(connectionUrl: String!, name: String!, hideDoltFeatures: Boolean, useSSL: Boolean, type: DatabaseType): CurrentDatabaseState!
   removeDatabaseConnection(name: String!): Boolean!
   createDatabase(databaseName: String!): Boolean!
-  createSchema(databaseName: String!, schemaName: String!): Boolean!
+  createSchema(refName: String!, databaseName: String!, schemaName: String!): Boolean!
   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!

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

@@ -18,9 +18,6 @@ export class DatabaseConnection {
   @Field(_type => DatabaseType, { nullable: true })
   type?: DatabaseType;
 
-  @Field({ nullable: true })
-  schema?: string;
-
   @Field({ nullable: true })
   isDolt?: boolean;
 }

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

@@ -10,7 +10,7 @@ import {
 import { ConnectionProvider } from "../connections/connection.provider";
 import { DataStoreService } from "../dataStore/dataStore.service";
 import { FileStoreService } from "../fileStore/fileStore.service";
-import { DBArgs, SchemaArgs } from "../utils/commonTypes";
+import { DBArgs, RefArgs, RefSchemaArgs } from "../utils/commonTypes";
 import { DatabaseType } from "./database.enum";
 import { DatabaseConnection } from "./database.model";
 
@@ -30,9 +30,6 @@ class AddDatabaseConnectionArgs {
 
   @Field(_type => DatabaseType, { nullable: true })
   type?: DatabaseType;
-
-  @Field({ nullable: true })
-  schema?: string;
 }
 
 @ObjectType()
@@ -51,10 +48,6 @@ class DoltDatabaseDetails {
 class CurrentDatabaseState {
   @Field({ nullable: true })
   currentDatabase?: string;
-
-  // Postgres only
-  @Field({ nullable: true })
-  currentSchema?: string;
 }
 
 @ArgsType()
@@ -99,7 +92,7 @@ export class DatabaseResolver {
   }
 
   @Query(_returns => [String])
-  async schemas(@Args() args: DBArgs): Promise<string[]> {
+  async schemas(@Args() args: RefArgs): Promise<string[]> {
     const conn = this.conn.connection();
     if (!conn.schemas) return [];
     const schemas = await conn.schemas(args);
@@ -133,7 +126,6 @@ export class DatabaseResolver {
       hideDoltFeatures: !!args.hideDoltFeatures,
       useSSL: !!args.useSSL,
       type,
-      schema: args.schema,
     };
 
     const { isDolt } = await this.conn.addConnection(workbenchConfig);
@@ -146,7 +138,7 @@ export class DatabaseResolver {
     }
 
     const db = await this.currentDatabase();
-    return { currentDatabase: db, currentSchema: args.schema };
+    return { currentDatabase: db };
   }
 
   @Mutation(_returns => Boolean)
@@ -169,7 +161,7 @@ export class DatabaseResolver {
   }
 
   @Mutation(_returns => Boolean)
-  async createSchema(@Args() args: SchemaArgs): Promise<boolean> {
+  async createSchema(@Args() args: RefSchemaArgs): Promise<boolean> {
     const conn = this.conn.connection();
     if (!conn.createSchema) return false;
     await conn.createSchema(args);

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

@@ -3,17 +3,27 @@ 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";
 
 export async function getDoltSchemas(
   em: EntityManager,
   type?: SchemaType,
+  pgSchema?: string,
 ): Promise<SchemaItem[]> {
   let sel = em
     .createQueryBuilder()
     .select("*")
-    .from(DoltSystemTable.SCHEMAS, "");
+    .from(
+      pgSchema
+        ? tableWithSchema({
+            tableName: DoltSystemTable.SCHEMAS,
+            schemaName: pgSchema,
+          })
+        : DoltSystemTable.SCHEMAS,
+      DoltSystemTable.SCHEMAS,
+    );
   if (type) {
     sel = sel.where(`${DoltSystemTable.SCHEMAS}.type = :type`, {
       type,

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

@@ -307,7 +307,8 @@ export class DoltQueryFactory
 
         if (res.length && res[0].conflicts !== "0") {
           await query("ROLLBACK");
-          throw new Error("Merge conflict detected");
+          const msg = res[0].message ?? "Merge conflict detected";
+          throw new Error(msg);
         }
 
         await query("COMMIT");