Skip to content

Commit

Permalink
Merge pull request #51 from dolthub/taylor/readme
Browse files Browse the repository at this point in the history
Add features to README, graphql diff bug fix
  • Loading branch information
tbantle22 authored Nov 17, 2023
2 parents fe8d7ef + 84dadbf commit 792e57a
Show file tree
Hide file tree
Showing 13 changed files with 58 additions and 15 deletions.
42 changes: 40 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,47 @@
# dolt-workbench

A modern SQL workbench for your MySQL-compatible database. Use [Dolt](https://doltdb.com)
A modern SQL workbench for your MySQL-compatible database. Use [Dolt](https://doltdb.com)
to unlock powerful version control features.

![Dolt Workbench](./images/workbench.png)
## Features

### Modern, web-based table browser

![Modern, web-based table browser](./images/table-browser.png)

### Auto-complete sql queries

![SQL queries](./images/sql-queries.png)

### Edit data using point and click interface

![Edit data](./images/edit-data.png)

### ER diagrams

![ER diagrams](./images/er-diagram.png)

### File upload

![File upload](./images/file-importer.png)

## Version control features with [Dolt](https://doltdb.com)

### Commit log visualizations

![Commit graph](./images/commit-graph.png)

### Branch navigation

![Branch navigation](./images/branches.png)

### Tags

![Tags](./images/tags.png)

### Pull requests

![Pull requests](./images/pull-diff.png)

## Getting started

Expand Down
30 changes: 17 additions & 13 deletions graphql-server/src/diffStats/diffStat.resolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,26 @@ export class DiffStatResolver {
const type = args.type ?? CommitDiffType.TwoDot;
checkArgs(args);

return this.dss.query(async query => {
if (type === CommitDiffType.ThreeDot) {
const res = await query(getThreeDotDiffStatQuery(!!args.tableName), [
`${args.toRefName}...${args.fromRefName}`,
return this.dss.query(
async query => {
if (type === CommitDiffType.ThreeDot) {
const res = await query(getThreeDotDiffStatQuery(!!args.tableName), [
`${args.toRefName}...${args.fromRefName}`,
args.tableName,
]);
return fromDoltDiffStat(res);
}

const res = await query(getDiffStatQuery(!!args.tableName), [
args.fromRefName,
args.toRefName,
args.tableName,
]);
return fromDoltDiffStat(res);
}

const res = await query(getDiffStatQuery(!!args.tableName), [
args.fromRefName,
args.toRefName,
args.tableName,
]);
return fromDoltDiffStat(res);
}, args.databaseName);
},
args.databaseName,
args.refName,
);
}
}

Expand Down
1 change: 1 addition & 0 deletions graphql-server/src/diffSummaries/diffSummary.resolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export class DiffSummaryResolver {
return this.dss.query(
async q => getDiffSummaries(q, args),
args.databaseName,
args.refName,
);
}
}
Expand Down
Binary file added images/branches.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/commit-graph.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/edit-data.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/er-diagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/file-importer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/pull-diff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sql-queries.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/table-browser.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/tags.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/workbench.png
Binary file not shown.

0 comments on commit 792e57a

Please sign in to comment.