mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-21 19:39:04 -05:00
Code Issues Packages Projects Releases 156 Wiki Activity

Merge main

Browse Source
This commit is contained in:
Zach Musgrave
2022-08-17 14:05:29 -07:00
parent 774fb5da18 673c78b7c9
commit ad7ccc42ad
13 changed files with 43 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/bump-dependency.yaml
+10 -31
View File
@@ -166,41 +166,20 @@ jobs:
if (pull.keepAlive) process.exit(0);
const checkSuiteRes = await github.checks.listSuitesForRef({
console.log(`Closing open pr ${pull.number}`);
await github.issues.createComment({
issue_number: pull.number,
owner,
repo,
ref: pull.headRef,
body: `This PR has been superseded by ${SUPERSEDED_BY}`
});
if (checkSuiteRes.data) {
for (const suite of checkSuiteRes.data.check_suites) {
console.log("suite id:", suite.id);
console.log("suite app slug:", suite.app.slug);
console.log("suite status:", suite.status);
console.log("suite conclusion:", suite.conclusion);
if (suite.app.slug === "github-actions") {
if (suite.status !== "completed" || suite.conclusion !== "success") {
console.log(`Leaving pr open due to status:${suite.status} conclusion${suite.conclusion}`);
process.exit(0);
}
}
}
console.log(`Closing open pr ${pull.number}`);
await github.issues.createComment({
issue_number: pull.number,
owner,
repo,
body: `This PR has been superseded by ${SUPERSEDED_BY}`
});
await github.pulls.update({
owner,
repo,
pull_number: pull.number,
state: 'closed',
});
}
await github.pulls.update({
owner,
repo,
pull_number: pull.number,
state: 'closed',
});
process.exit(0);
} catch(err) {
.github/workflows/ci-bats-windows.yaml
+1 -1
View File
@@ -180,5 +180,5 @@ jobs:
region: us-west-2
version: ${{ github.event.client_payload.ref }}
template: 'BatsWindowsFailureTemplate'
toAddresses: '["${{ github.event.client_payload.actor_email }}"]'
toAddresses: '["${{ github.event.client_payload.actor_email }}", "tim@dolthub.com"]'
workflowURL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
go/go.mod
+1 -1
View File
@@ -58,7 +58,7 @@ require (
)
require (
github.com/dolthub/go-mysql-server v0.12.1-0.20220817160542-b0adf3db252c
github.com/dolthub/go-mysql-server v0.12.1-0.20220817164438-ef1355ed2183
github.com/google/flatbuffers v2.0.6+incompatible
github.com/gosuri/uilive v0.0.4
github.com/kch42/buzhash v0.0.0-20160816060738-9bdec3dec7c6
go/go.sum
+2 -2
View File
@@ -173,8 +173,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
github.com/dolthub/go-mysql-server v0.12.1-0.20220817160542-b0adf3db252c h1:uQ3BheksaUdw1lhdauBS3cYub63GyPkBEJqey2p0bzQ=
github.com/dolthub/go-mysql-server v0.12.1-0.20220817160542-b0adf3db252c/go.mod h1:C2PIBfi3LwQT4tJDlT+ZhSQnzzvF3umvhBhwlxGnppg=
github.com/dolthub/go-mysql-server v0.12.1-0.20220817164438-ef1355ed2183 h1:YZdSjlqIzlO2z645/1qMWDtydTPq5kWYz+3WVh8ioGA=
github.com/dolthub/go-mysql-server v0.12.1-0.20220817164438-ef1355ed2183/go.mod h1:C2PIBfi3LwQT4tJDlT+ZhSQnzzvF3umvhBhwlxGnppg=
github.com/dolthub/ishell v0.0.0-20220112232610-14e753f0f371 h1:oyPHJlzumKta1vnOQqUnfdz+pk3EmnHS3Nd0cCT0I2g=
github.com/dolthub/ishell v0.0.0-20220112232610-14e753f0f371/go.mod h1:dhGBqcCEfK5kuFmeO5+WOx3hqc1k3M29c1oS/R7N4ms=
github.com/dolthub/jsonpath v0.0.0-20210609232853-d49537a30474 h1:xTrR+l5l+1Lfq0NvhiEsctylXinUMFhhsqaEcl414p8=
go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go
+2 -2
View File
@@ -1368,7 +1368,7 @@ func TestDoltStorageFormat(t *testing.T) {
if types.IsFormat_DOLT(types.Format_Default) {
expectedFormatString = "NEW ( __DOLT__ )"
} else {
expectedFormatString = "OLD ( __LD_1__ )"
expectedFormatString = fmt.Sprintf("OLD ( %s )", types.Format_Default.VersionString())
}
script := queries.ScriptTest{
Name: "dolt storage format function works",
@@ -1387,7 +1387,7 @@ func TestDoltStorageFormatPrepared(t *testing.T) {
if types.IsFormat_DOLT(types.Format_Default) {
expectedFormatString = "NEW ( __DOLT__ )"
} else {
expectedFormatString = "OLD ( __LD_1__ )"
expectedFormatString = fmt.Sprintf("OLD ( %s )", types.Format_Default.VersionString())
}
enginetest.TestPreparedQuery(t, newDoltHarness(t), "SELECT dolt_storage_format()", []sql.Row{{expectedFormatString}}, nil)
}
go/libraries/doltcore/sqle/enginetest/dolt_server_test.go
+4 -4
View File
@@ -131,7 +131,7 @@ var DoltBranchMultiSessionScriptTests = []queries.ScriptTest{
},
{
Query: "/* client a */ SHOW DATABASES;",
Expected: []sql.Row{{"dolt"}, {"dolt/branch1"}, {"dolt/branch2"}, {"information_schema"}},
Expected: []sql.Row{{"dolt"}, {"dolt/branch1"}, {"dolt/branch2"}, {"information_schema"}, {"mysql"}},
},
{
Query: "/* client a */ CALL DOLT_BRANCH('-d', 'branch2');",
@@ -143,7 +143,7 @@ var DoltBranchMultiSessionScriptTests = []queries.ScriptTest{
},
{
Query: "/* client a */ SHOW DATABASES;",
Expected: []sql.Row{{"dolt"}, {"dolt/branch1"}, {"information_schema"}},
Expected: []sql.Row{{"dolt"}, {"dolt/branch1"}, {"information_schema"}, {"mysql"}},
},
{
// Call a stored procedure since this searches across all databases and will
@@ -178,7 +178,7 @@ var DoltBranchMultiSessionScriptTests = []queries.ScriptTest{
},
{
Query: "/* client a */ SHOW DATABASES;",
Expected: []sql.Row{{"dolt"}, {"dolt/branch1"}, {"dolt/branch2"}, {"information_schema"}},
Expected: []sql.Row{{"dolt"}, {"dolt/branch1"}, {"dolt/branch2"}, {"information_schema"}, {"mysql"}},
},
{
Query: "/* client a */ CALL DOLT_BRANCH('-m', 'branch2', 'newName');",
@@ -190,7 +190,7 @@ var DoltBranchMultiSessionScriptTests = []queries.ScriptTest{
},
{
Query: "/* client a */ SHOW DATABASES;",
Expected: []sql.Row{{"dolt"}, {"dolt/branch1"}, {"information_schema"}},
Expected: []sql.Row{{"dolt"}, {"dolt/branch1"}, {"information_schema"}, {"mysql"}},
},
{
// Call a stored procedure since this searches across all databases and will
go/store/prolly/ordered_tree.go
+1 -1
View File
@@ -51,7 +51,7 @@ func diffOrderedTrees[K, V ~[]byte, O ordering[K]](
cfn := func(left, right tree.Item) int {
return from.order.Compare(K(left), K(right))
}
differ, err := tree.DifferFromRoots(ctx, from.ns, from.root, to.root, cfn)
differ, err := tree.DifferFromRoots(ctx, from.ns, to.ns, from.root, to.root, cfn)
if err != nil {
return err
}
go/store/prolly/tree/diff.go
+3 -3
View File
@@ -39,13 +39,13 @@ type Differ struct {
cmp CompareFn
}
func DifferFromRoots(ctx context.Context, ns NodeStore, from, to Node, cmp CompareFn) (Differ, error) {
fc, err := NewCursorAtStart(ctx, ns, from)
func DifferFromRoots(ctx context.Context, fromNs NodeStore, toNs NodeStore, from, to Node, cmp CompareFn) (Differ, error) {
fc, err := NewCursorAtStart(ctx, fromNs, from)
if err != nil {
return Differ{}, err
}
tc, err := NewCursorAtStart(ctx, ns, to)
tc, err := NewCursorAtStart(ctx, toNs, to)
if err != nil {
return Differ{}, err
}
go/store/prolly/tree/merge.go
+2 -2
View File
@@ -48,12 +48,12 @@ func ThreeWayMerge[S message.Serializer](
valDesc val.TupleDesc,
) (final Node, err error) {
ld, err := DifferFromRoots(ctx, ns, base, left, compare)
ld, err := DifferFromRoots(ctx, ns, ns, base, left, compare)
if err != nil {
return Node{}, err
}
rd, err := DifferFromRoots(ctx, ns, base, right, compare)
rd, err := DifferFromRoots(ctx, ns, ns, base, right, compare)
if err != nil {
return Node{}, err
}
integration-tests/bats/config.bats
+1 -1
View File
@@ -191,7 +191,7 @@ teardown() {
start_sql_server
server_query "" 1 "create database testdb"
server_query "" 1 "show databases" "Database\ninformation_schema\ntestdb"
server_query "" 1 "show databases" "Database\ninformation_schema\nmysql\ntestdb"
server_query "testdb" 1 "create table a(x int)"
server_query "testdb" 1 "insert into a values (1), (2)"
integration-tests/bats/sql-multi-db.bats
+1 -1
View File
@@ -30,7 +30,7 @@ seed_repos_with_tables_with_use_statements() {
}
@test "sql-multi-db: sql multi-db test show databases" {
EXPECTED=$(echo -e "Database\ninformation_schema\nrepo1\nrepo2")
EXPECTED=$(echo -e "Database\ninformation_schema\nmysql\nrepo1\nrepo2")
run dolt sql -r csv --data-dir ./ -q "SHOW DATABASES"
[ "$status" -eq 0 ]
[[ "$output" =~ "$EXPECTED" ]] || false
integration-tests/bats/sql-privs.bats
+5 -5
View File
@@ -215,7 +215,7 @@ teardown() {
! [[ "$output" =~ ".doltcfg" ]] || false
! [[ "$output" =~ "privileges.db" ]] || false
server_query db1 1 "show databases" "Database\ndb1\ndb2\ndb3\ninformation_schema"
server_query db1 1 "show databases" "Database\ndb1\ndb2\ndb3\ninformation_schema\nmysql"
server_query db1 1 "select user from mysql.user order by user" "User\ndolt"
server_query db1 1 "create user new_user" ""
server_query db1 1 "select user from mysql.user order by user" "User\ndolt\nnew_user"
@@ -285,7 +285,7 @@ teardown() {
! [[ "$output" =~ ".doltcfg" ]] || false
! [[ "$output" =~ "privileges.db" ]] || false
server_query db1 1 "show databases" "Database\ndb1\ndb2\ndb3\ninformation_schema"
server_query db1 1 "show databases" "Database\ndb1\ndb2\ndb3\ninformation_schema\nmysql"
server_query db1 1 "select user from mysql.user order by user" "User\ndolt"
server_query db1 1 "create user new_user" ""
server_query db1 1 "select user from mysql.user order by user" "User\ndolt\nnew_user"
@@ -316,7 +316,7 @@ teardown() {
! [[ "$output" =~ ".doltcfg" ]] || false
! [[ "$output" =~ "privs.db" ]] || false
server_query db1 1 "show databases" "Database\ndb1\ndb2\ndb3\ninformation_schema"
server_query db1 1 "show databases" "Database\ndb1\ndb2\ndb3\ninformation_schema\nmysql"
server_query db1 1 "select user from mysql.user order by user" "User\ndolt"
server_query db1 1 "create user new_user" ""
server_query db1 1 "select user from mysql.user order by user" "User\ndolt\nnew_user"
@@ -368,7 +368,7 @@ teardown() {
! [[ "$output" =~ "privileges.db" ]] || false
! [[ "$output" =~ "privs.db" ]] || false
server_query db1 1 "show databases" "Database\ndb1\ndb2\ndb3\ninformation_schema"
server_query db1 1 "show databases" "Database\ndb1\ndb2\ndb3\ninformation_schema\nmysql"
server_query db1 1 "select user from mysql.user order by user" "User\ndolt"
server_query db1 1 "create user new_user" ""
server_query db1 1 "select user from mysql.user order by user" "User\ndolt\nnew_user"
@@ -406,4 +406,4 @@ teardown() {
cd db_dir
start_sql_server_with_args --host 0.0.0.0 --user=dolt
server_query db1 1 "select user from mysql.user order by user" "User\ndolt\nnew_user"
}
}
integration-tests/bats/sql-server.bats
+10 -10
View File
@@ -41,7 +41,7 @@ teardown() {
# start the server and ensure there are no databases yet
cd $tempDir/empty_server
start_sql_server
unselected_server_query 1 "show databases" "Database\ninformation_schema"
unselected_server_query 1 "show databases" "Database\ninformation_schema\nmysql"
# verify that dolt_clone works
# TODO: Once dolt_clone can be called without a selected database, this can be removed
@@ -572,7 +572,7 @@ SQL
server_query repo1 1 "SELECT * FROM test.pk ORDER BY pk" "pk\n0"
server_query repo1 1 "DROP DATABASE test" ""
server_query repo1 1 "SHOW DATABASES" "Database\ninformation_schema\nrepo1"
server_query repo1 1 "SHOW DATABASES" "Database\ninformation_schema\nmysql\nrepo1"
}
@test "sql-server: DOLT_ADD, DOLT_COMMIT, DOLT_CHECKOUT, DOLT_MERGE work together in server mode" {
@@ -1200,7 +1200,7 @@ END""")
start_sql_server
server_query "" 1 "create database test1"
server_query "" 1 "show databases" "Database\ninformation_schema\ntest1"
server_query "" 1 "show databases" "Database\ninformation_schema\nmysql\ntest1"
server_query "test1" 1 "create table a(x int)"
server_query "test1" 1 "insert into a values (1), (2)"
# not bothering to check the results of the commit here
@@ -1245,7 +1245,7 @@ END""")
# make sure the databases exist on restart
stop_sql_server
start_sql_server
server_query "" 1 "show databases" "Database\ninformation_schema\ntest1\ntest3"
server_query "" 1 "show databases" "Database\ninformation_schema\nmysql\ntest1\ntest3"
}
@test "sql-server: drop database with active connections" {
@@ -1259,7 +1259,7 @@ END""")
server_query "" 1 "create database test2"
server_query "" 1 "create database test3"
server_query "" 1 "show databases" "Database\ninformation_schema\ntest1\ntest2\ntest3"
server_query "" 1 "show databases" "Database\ninformation_schema\nmysql\ntest1\ntest2\ntest3"
server_query "test1" 1 "create table a(x int)"
server_query "test1" 1 "insert into a values (1), (2)"
run server_query "test1" 1 "select dolt_commit('-a', '-m', 'new table a')"
@@ -1306,7 +1306,7 @@ END""")
server_query "" 1 "create database Test1"
server_query "" 1 "show databases" "Database\nTest1\ninformation_schema"
server_query "" 1 "show databases" "Database\nTest1\ninformation_schema\nmysql"
multi_query "" 1 "use test1; create table a(x int);"
multi_query "" 1 "use TEST1; insert into a values (1), (2);"
run multi_query "" 1 "use test1; select dolt_commit('-a', '-m', 'new table a');"
@@ -1327,7 +1327,7 @@ END""")
start_sql_server_with_args --host 0.0.0.0 --user dolt --data-dir=db_dir
server_query "" 1 "create database test1"
server_query "" 1 "show databases" "Database\ninformation_schema\ntest1"
server_query "" 1 "show databases" "Database\ninformation_schema\nmysql\ntest1"
server_query "test1" 1 "create table a(x int)"
server_query "test1" 1 "insert into a values (1), (2)"
# not bothering to check the results of the commit here
@@ -1355,7 +1355,7 @@ END""")
# make sure the databases exist on restart
stop_sql_server
start_sql_server_with_args --host 0.0.0.0 --user dolt --data-dir=db_dir
server_query "" 1 "show databases" "Database\ninformation_schema\ntest3"
server_query "" 1 "show databases" "Database\ninformation_schema\nmysql\ntest3"
}
@test "sql-server: create database errors" {
@@ -1383,7 +1383,7 @@ END""")
start_sql_server
server_query "" 1 "create database test1"
server_query "repo1" 1 "show databases" "Database\ninformation_schema\nrepo1\ntest1"
server_query "repo1" 1 "show databases" "Database\ninformation_schema\nmysql\nrepo1\ntest1"
server_query "test1" 1 "create table a(x int)"
server_query "test1" 1 "insert into a values (1), (2)"
# not bothering to check the results of the commit here
@@ -1417,7 +1417,7 @@ END""")
# make sure the databases exist on restart
stop_sql_server
start_sql_server
server_query "" 1 "show databases" "Database\ninformation_schema\nrepo1\ntest1\ntest2"
server_query "" 1 "show databases" "Database\ninformation_schema\nmysql\nrepo1\ntest1\ntest2"
}
@test "sql-server: fetch uses database tempdir from different working directory" {