-
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'taylor/pg-schema' into taylor/dg-support
- Loading branch information
Showing
138 changed files
with
1,378 additions
and
1,024 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,6 +4,7 @@ | |
"description": "", | ||
"author": "DoltHub", | ||
"private": true, | ||
"packageManager": "[email protected]", | ||
"scripts": { | ||
"ci": "yarn prettier && yarn compile && yarn lint && yarn test && yarn build && yarn check-server", | ||
"build": "nest build", | ||
|
@@ -18,7 +19,8 @@ | |
"prettier-fix": "prettier --write 'src/**/*.{js,ts}'", | ||
"lint": "eslint --cache --ext .ts,.js,.tsx,.jsx .", | ||
"lint-errors": "eslint --quiet --cache --ext .ts,.js,.tsx,.jsx .", | ||
"test": "jest --passWithNoTests", | ||
"test": "jest --silent", | ||
"test:loud": "jest", | ||
"yalc:react-lib": "yalc link @dolthub/react-hooks && yalc link @dolthub/web-utils", | ||
"yalc:clean": "yalc remove --all" | ||
}, | ||
|
@@ -52,6 +54,7 @@ | |
"devDependencies": { | ||
"@types/cookie-parser": "^1", | ||
"@types/cors": "^2", | ||
"@types/jest": "^29.5.12", | ||
"@types/node": "^20.12.2", | ||
"@types/semver": "^7", | ||
"@typescript-eslint/eslint-plugin": "^7.5.0", | ||
|
@@ -62,9 +65,9 @@ | |
"eslint-config-prettier": "^9.0.0", | ||
"eslint-plugin-import": "^2.29.0", | ||
"eslint-plugin-jest": "^27.9.0", | ||
"jest": "^29.5.0", | ||
"jest": "^29.7.0", | ||
"prettier": "^3.1.1", | ||
"ts-jest": "^29.1.1", | ||
"ts-jest": "^29.2.4", | ||
"ts-loader": "^9.5.1", | ||
"ts-node": "^10.5.0", | ||
"tsconfig-paths": "^4.2.0", | ||
|
@@ -85,6 +88,5 @@ | |
}, | ||
"coverageDirectory": "./coverage", | ||
"testEnvironment": "node" | ||
}, | ||
"packageManager": "[email protected]" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
import { replaceDatabaseInConnectionUrl } from "./util"; | ||
|
||
const tests = [ | ||
{ | ||
desc: "with existing database", | ||
connectionUrl: "postgres://localhost:27017/test", | ||
dbName: "newdb", | ||
expected: "postgres://localhost:27017/newdb", | ||
}, | ||
{ | ||
desc: "with user and existing database", | ||
connectionUrl: "postgresql://taylor@localhost:5432/test", | ||
dbName: "newdb", | ||
expected: "postgresql://taylor@localhost:5432/newdb", | ||
}, | ||
{ | ||
desc: "with user, password, and existing database", | ||
connectionUrl: "postgresql://taylor:pass@localhost:5432/test", | ||
dbName: "newdb", | ||
expected: "postgresql://taylor:pass@localhost:5432/newdb", | ||
}, | ||
{ | ||
desc: "with no database", | ||
connectionUrl: "postgres://localhost:27017", | ||
dbName: "newdb", | ||
expected: "postgres://localhost:27017/newdb", | ||
}, | ||
]; | ||
|
||
describe("test replaceDatabaseInConnectionUrl", () => { | ||
tests.forEach(test => { | ||
it(`should replace the database name in the connection URL ${test.desc}`, () => { | ||
const result = replaceDatabaseInConnectionUrl( | ||
test.connectionUrl, | ||
test.dbName, | ||
); | ||
expect(result).toEqual(test.expected); | ||
}); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
export function replaceDatabaseInConnectionUrl( | ||
connectionUrl: string, | ||
dbName: string, | ||
): string { | ||
const url = new URL(connectionUrl); | ||
url.pathname = `/${dbName}`; | ||
return url.toString(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.