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

Added CALL ... AS OF

Browse Source
This commit is contained in:
Daylon Wilkins
2023-01-17 06:50:41 -08:00
parent cfaf231e9d
commit 646f05475d
8 changed files with 391 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/go.mod
+1 -1
View File
@@ -58,7 +58,7 @@ require (
github.com/cenkalti/backoff/v4 v4.1.3
github.com/cespare/xxhash v1.1.0
github.com/creasty/defaults v1.6.0
github.com/dolthub/go-mysql-server v0.14.1-0.20230113174939-020f13f24a03
github.com/dolthub/go-mysql-server v0.14.1-0.20230117144013-b9491d07737f
github.com/google/flatbuffers v2.0.6+incompatible
github.com/kch42/buzhash v0.0.0-20160816060738-9bdec3dec7c6
github.com/mitchellh/go-ps v1.0.0
go/go.sum
+2 -2
View File
@@ -161,8 +161,8 @@ github.com/dolthub/flatbuffers v1.13.0-dh.1 h1:OWJdaPep22N52O/0xsUevxJ6Qfw1M2txC
github.com/dolthub/flatbuffers v1.13.0-dh.1/go.mod h1:CorYGaDmXjHz1Z7i50PYXG1Ricn31GcA2wNOTFIQAKE=
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.14.1-0.20230113174939-020f13f24a03 h1:H4U928DxGBK1YsngCOnix7EkKKVf6MTD3+C2RP2tfoo=
github.com/dolthub/go-mysql-server v0.14.1-0.20230113174939-020f13f24a03/go.mod h1:ykkkC0nmCN0Dd7bpm+AeM6w4jcxfV9vIfLQEmajj20I=
github.com/dolthub/go-mysql-server v0.14.1-0.20230117144013-b9491d07737f h1:A8+lYgdKd/2TzD/UsdnK1E1TZtX9q8zDTK7/03+znnQ=
github.com/dolthub/go-mysql-server v0.14.1-0.20230117144013-b9491d07737f/go.mod h1:ykkkC0nmCN0Dd7bpm+AeM6w4jcxfV9vIfLQEmajj20I=
github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488 h1:0HHu0GWJH0N6a6keStrHhUAK5/o9LVfkh44pvsV4514=
github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto=
github.com/dolthub/jsonpath v0.0.0-20210609232853-d49537a30474 h1:xTrR+l5l+1Lfq0NvhiEsctylXinUMFhhsqaEcl414p8=
go/libraries/doltcore/sqle/clusterdb/database.go
+4
View File
@@ -61,6 +61,10 @@ func NewClusterDatabase(p ClusterStatusProvider) sql.Database {
// Implement StoredProcedureDatabase so that external stored procedures are available.
var _ sql.StoredProcedureDatabase = database{}
func (database) GetStoredProcedure(ctx *sql.Context, name string) (sql.StoredProcedureDetails, bool, error) {
return sql.StoredProcedureDetails{}, false, nil
}
func (database) GetStoredProcedures(ctx *sql.Context) ([]sql.StoredProcedureDetails, error) {
return nil, nil
}
go/libraries/doltcore/sqle/database.go
+13 -1
View File
@@ -1229,9 +1229,21 @@ func (db Database) DropTrigger(ctx *sql.Context, name string) error {
return db.dropFragFromSchemasTable(ctx, "trigger", name, sql.ErrTriggerDoesNotExist.New(name))
}
// GetStoredProcedure implements sql.StoredProcedureDatabase.
func (db Database) GetStoredProcedure(ctx *sql.Context, name string) (sql.StoredProcedureDetails, bool, error) {
procedures, err := DoltProceduresGetAll(ctx, db, strings.ToLower(name))
if err != nil {
return sql.StoredProcedureDetails{}, false, nil
}
if len(procedures) == 1 {
return procedures[0], true, nil
}
return sql.StoredProcedureDetails{}, false, nil
}
// GetStoredProcedures implements sql.StoredProcedureDatabase.
func (db Database) GetStoredProcedures(ctx *sql.Context) ([]sql.StoredProcedureDetails, error) {
return DoltProceduresGetAll(ctx, db)
return DoltProceduresGetAll(ctx, db, "")
}
// SaveStoredProcedure implements sql.StoredProcedureDatabase.
go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go
+7 -1
View File
@@ -46,7 +46,7 @@ var skipPrepared bool
// SkipPreparedsCount is used by the "ci-check-repo CI workflow
// as a reminder to consider prepareds when adding a new
// enginetest suite.
const SkipPreparedsCount = 83
const SkipPreparedsCount = 84
const skipPreparedFlag = "DOLT_SKIP_PREPARED_ENGINETESTS"
@@ -716,6 +716,12 @@ func TestStoredProcedures(t *testing.T) {
enginetest.TestStoredProcedures(t, newDoltHarness(t))
}
func TestCallAsOf(t *testing.T) {
for _, script := range DoltCallAsOf {
enginetest.TestScript(t, newDoltHarness(t), script)
}
}
func TestLargeJsonObjects(t *testing.T) {
SkipByDefaultInCI(t)
harness := newDoltHarness(t)
go/libraries/doltcore/sqle/enginetest/dolt_queries.go
+353
View File
@@ -3420,3 +3420,356 @@ var DoltIndexPrefixScripts = []queries.ScriptTest{
},
},
}
// DoltCallAsOf are tests of using CALL ... AS OF using commits
var DoltCallAsOf = []queries.ScriptTest{
{
Name: "Database syntax properly handles inter-CALL communication",
SetUpScript: []string{
`CREATE PROCEDURE p1()
BEGIN
DECLARE str VARCHAR(20);
CALL p2(str);
SET str = CONCAT('a', str);
SELECT str;
END`,
`CREATE PROCEDURE p2(OUT param VARCHAR(20))
BEGIN
SET param = 'b';
END`,
"CALL DOLT_ADD('-A');",
"CALL DOLT_COMMIT('-m', 'First procedures');",
"CALL DOLT_BRANCH('p12');",
"DROP PROCEDURE p1;",
"DROP PROCEDURE p2;",
`CREATE PROCEDURE p1()
BEGIN
DECLARE str VARCHAR(20);
CALL p2(str);
SET str = CONCAT('c', str);
SELECT str;
END`,
`CREATE PROCEDURE p2(OUT param VARCHAR(20))
BEGIN
SET param = 'd';
END`,
"CALL DOLT_ADD('-A');",
"CALL DOLT_COMMIT('-m', 'Second procedures');",
},
Assertions: []queries.ScriptTestAssertion{
{
Query: "CALL p1();",
Expected: []sql.Row{{"cd"}},
},
{
Query: "CALL `mydb/main`.p1();",
Expected: []sql.Row{{"cd"}},
},
{
Query: "CALL `mydb/p12`.p1();",
Expected: []sql.Row{{"ab"}},
},
},
},
{
Name: "CALL ... AS OF references historic data through nested calls",
SetUpScript: []string{
"CREATE TABLE test (v1 BIGINT);",
"INSERT INTO test VALUES (1);",
`CREATE PROCEDURE p1()
BEGIN
CALL p2();
END`,
`CREATE PROCEDURE p2()
BEGIN
SELECT * FROM test;
END`,
"CALL DOLT_ADD('-A');",
"CALL DOLT_COMMIT('-m', 'commit message');",
"UPDATE test SET v1 = 2;",
"CALL DOLT_ADD('-A');",
"CALL DOLT_COMMIT('-m', 'commit message');",
"UPDATE test SET v1 = 3;",
"CALL DOLT_ADD('-A');",
"CALL DOLT_COMMIT('-m', 'commit message');",
"UPDATE test SET v1 = 4;",
"CALL DOLT_ADD('-A');",
"CALL DOLT_COMMIT('-m', 'commit message');",
},
Assertions: []queries.ScriptTestAssertion{
{
Query: "CALL p1();",
Expected: []sql.Row{{4}},
},
{
Query: "CALL p1() AS OF 'HEAD';",
Expected: []sql.Row{{4}},
},
{
Query: "CALL p1() AS OF 'HEAD~1';",
Expected: []sql.Row{{3}},
},
{
Query: "CALL p1() AS OF 'HEAD~2';",
Expected: []sql.Row{{2}},
},
{
Query: "CALL p1() AS OF 'HEAD~3';",
Expected: []sql.Row{{1}},
},
},
},
{
Name: "CALL ... AS OF doesn't overwrite nested CALL ... AS OF",
SetUpScript: []string{
"CREATE TABLE myhistorytable (pk BIGINT PRIMARY KEY, s TEXT);",
"INSERT INTO myhistorytable VALUES (1, 'first row, 1'), (2, 'second row, 1'), (3, 'third row, 1');",
"CREATE PROCEDURE p1() BEGIN CALL p2(); END",
"CREATE PROCEDURE p1a() BEGIN CALL p2() AS OF 'HEAD~2'; END",
"CREATE PROCEDURE p1b() BEGIN CALL p2a(); END",
"CREATE PROCEDURE p2() BEGIN SELECT * FROM myhistorytable; END",
"CALL DOLT_ADD('-A');",
"CALL DOLT_COMMIT('-m', 'commit message');",
"DELETE FROM myhistorytable;",
"INSERT INTO myhistorytable VALUES (1, 'first row, 2'), (2, 'second row, 2'), (3, 'third row, 2');",
"CALL DOLT_ADD('-A');",
"CALL DOLT_COMMIT('-m', 'commit message');",
"DROP TABLE myhistorytable;",
"CREATE TABLE myhistorytable (pk BIGINT PRIMARY KEY, s TEXT, c TEXT);",
"INSERT INTO myhistorytable VALUES (1, 'first row, 3', '1'), (2, 'second row, 3', '2'), (3, 'third row, 3', '3');",
"CREATE PROCEDURE p2a() BEGIN SELECT * FROM myhistorytable AS OF 'HEAD~1'; END",
"CALL DOLT_ADD('-A');",
"CALL DOLT_COMMIT('-m', 'commit message');",
},
Assertions: []queries.ScriptTestAssertion{
{
Query: "CALL p1();",
Expected: []sql.Row{
{int64(1), "first row, 3", "1"},
{int64(2), "second row, 3", "2"},
{int64(3), "third row, 3", "3"},
},
},
{
Query: "CALL p1a();",
Expected: []sql.Row{
{int64(1), "first row, 1"},
{int64(2), "second row, 1"},
{int64(3), "third row, 1"},
},
},
{
Query: "CALL p1b();",
Expected: []sql.Row{
{int64(1), "first row, 2"},
{int64(2), "second row, 2"},
{int64(3), "third row, 2"},
},
},
{
Query: "CALL p2();",
Expected: []sql.Row{
{int64(1), "first row, 3", "1"},
{int64(2), "second row, 3", "2"},
{int64(3), "third row, 3", "3"},
},
},
{
Query: "CALL p2a();",
Expected: []sql.Row{
{int64(1), "first row, 2"},
{int64(2), "second row, 2"},
{int64(3), "third row, 2"},
},
},
{
Query: "CALL p1() AS OF 'HEAD~2';",
Expected: []sql.Row{
{int64(1), "first row, 1"},
{int64(2), "second row, 1"},
{int64(3), "third row, 1"},
},
},
{
Query: "CALL p1a() AS OF 'HEAD';",
Expected: []sql.Row{
{int64(1), "first row, 1"},
{int64(2), "second row, 1"},
{int64(3), "third row, 1"},
},
},
{
Query: "CALL p1b() AS OF 'HEAD';",
Expected: []sql.Row{
{int64(1), "first row, 2"},
{int64(2), "second row, 2"},
{int64(3), "third row, 2"},
},
},
{
Query: "CALL p2() AS OF 'HEAD~2';",
Expected: []sql.Row{
{int64(1), "first row, 1"},
{int64(2), "second row, 1"},
{int64(3), "third row, 1"},
},
},
{
Query: "CALL p2a() AS OF 'HEAD';",
Expected: []sql.Row{
{int64(1), "first row, 2"},
{int64(2), "second row, 2"},
{int64(3), "third row, 2"},
},
},
},
},
{
Name: "CALL ... AS OF errors if attempting to modify a table",
SetUpScript: []string{
"CREATE TABLE test (v1 BIGINT);",
"INSERT INTO test VALUES (2);",
"CALL DOLT_ADD('-A');",
"CALL DOLT_COMMIT('-m', 'commit message');",
`CREATE PROCEDURE p1()
BEGIN
UPDATE test SET v1 = v1 * 2;
END`,
"CALL DOLT_ADD('-A');",
"CALL DOLT_COMMIT('-m', 'commit message');",
},
Assertions: []queries.ScriptTestAssertion{
{
Query: "SELECT * FROM test;",
Expected: []sql.Row{{2}},
},
{
Query: "CALL p1();",
Expected: []sql.Row{{sql.OkResult{RowsAffected: 1, Info: plan.UpdateInfo{Matched: 1, Updated: 1}}}},
},
{
Query: "SELECT * FROM test;",
Expected: []sql.Row{{4}},
},
{
Query: "CALL p1() AS OF 'HEAD~1';",
ExpectedErr: sql.ErrProcedureCallAsOfReadOnly,
},
},
},
{
Name: "Database syntax propogates to inner calls",
SetUpScript: []string{
"CALL DOLT_CHECKOUT('main');",
`CREATE PROCEDURE p4()
BEGIN
CALL p5();
END`,
`CREATE PROCEDURE p5()
BEGIN
SELECT 3;
END`,
"CALL DOLT_ADD('-A');",
"CALL DOLT_COMMIT('-m', 'commit message');",
"CALL DOLT_BRANCH('p45');",
"DROP PROCEDURE p4;",
"DROP PROCEDURE p5;",
`CREATE PROCEDURE p4()
BEGIN
CALL p5();
END`,
`CREATE PROCEDURE p5()
BEGIN
SELECT 4;
END`,
"CALL DOLT_ADD('-A');",
"CALL DOLT_COMMIT('-m', 'commit message');",
},
Assertions: []queries.ScriptTestAssertion{
{
Query: "CALL p4();",
Expected: []sql.Row{{4}},
},
{
Query: "CALL p5();",
Expected: []sql.Row{{4}},
},
{
Query: "CALL `mydb/main`.p4();",
Expected: []sql.Row{{4}},
},
{
Query: "CALL `mydb/main`.p5();",
Expected: []sql.Row{{4}},
},
{
Query: "CALL `mydb/p45`.p4();",
Expected: []sql.Row{{3}},
},
{
Query: "CALL `mydb/p45`.p5();",
Expected: []sql.Row{{3}},
},
},
},
{
Name: "Database syntax with AS OF",
SetUpScript: []string{
"CREATE TABLE test (v1 BIGINT);",
"INSERT INTO test VALUES (2);",
`CREATE PROCEDURE p1()
BEGIN
SELECT v1 * 10 FROM test;
END`,
"CALL DOLT_ADD('-A');",
"CALL DOLT_COMMIT('-m', 'commit message');",
"CALL DOLT_BRANCH('other');",
"DROP PROCEDURE p1;",
`CREATE PROCEDURE p1()
BEGIN
SELECT v1 * 100 FROM test;
END`,
"UPDATE test SET v1 = 3;",
"CALL DOLT_ADD('-A');",
"CALL DOLT_COMMIT('-m', 'commit message');",
},
Assertions: []queries.ScriptTestAssertion{
{
Query: "CALL p1();",
Expected: []sql.Row{{300}},
},
{
Query: "CALL `mydb/main`.p1();",
Expected: []sql.Row{{300}},
},
{
Query: "CALL `mydb/other`.p1();",
Expected: []sql.Row{{30}},
},
{
Query: "CALL p1() AS OF 'HEAD';",
Expected: []sql.Row{{300}},
},
{
Query: "CALL `mydb/main`.p1() AS OF 'HEAD';",
Expected: []sql.Row{{300}},
},
{
Query: "CALL `mydb/other`.p1() AS OF 'HEAD';",
Expected: []sql.Row{{30}},
},
{
Query: "CALL p1() AS OF 'HEAD~1';",
Expected: []sql.Row{{200}},
},
{
Query: "CALL `mydb/main`.p1() AS OF 'HEAD~1';",
Expected: []sql.Row{{200}},
},
{
Query: "CALL `mydb/other`.p1() AS OF 'HEAD~1';",
Expected: []sql.Row{{20}},
},
},
},
}
go/libraries/doltcore/sqle/procedures_table.go
+9 -2
View File
@@ -107,7 +107,9 @@ func DoltProceduresGetTable(ctx *sql.Context, db Database) (*WritableDoltTable,
}
}
func DoltProceduresGetAll(ctx *sql.Context, db Database) ([]sql.StoredProcedureDetails, error) {
// DoltProceduresGetAll returns all stored procedures for the database if the procedureName is blank (and empty string),
// or it returns only the procedure with the matching name if one is given. The name is not case-sensitive.
func DoltProceduresGetAll(ctx *sql.Context, db Database, procedureName string) ([]sql.StoredProcedureDetails, error) {
tbl, err := DoltProceduresGetTable(ctx, db)
if err != nil {
return nil, err
@@ -129,7 +131,12 @@ func DoltProceduresGetAll(ctx *sql.Context, db Database) ([]sql.StoredProcedureD
}
nameExpr := idx.Expressions()[0]
lookup, err := sql.NewIndexBuilder(idx).IsNotNull(ctx, nameExpr).Build(ctx)
var lookup sql.IndexLookup
if procedureName == "" {
lookup, err = sql.NewIndexBuilder(idx).IsNotNull(ctx, nameExpr).Build(ctx)
} else {
lookup, err = sql.NewIndexBuilder(idx).Equals(ctx, nameExpr, procedureName).Build(ctx)
}
if err != nil {
return nil, err
}
integration-tests/bats/deleted-branches.bats
+2
View File
@@ -106,6 +106,7 @@ make_it() {
}
@test "deleted-branches: calling DOLT_CHECKOUT on SQL connection with existing branch revision specifier when dolt_default_branch is invalid does not panic" {
skip "Will fix in a future PR"
make_it
start_sql_server "dolt_repo_$$"
@@ -122,6 +123,7 @@ make_it() {
}
@test "deleted-branches: calling DOLT_CHECKOUT on SQL connection with existing branch revision specifier set to existing branch when default branch is deleted does not panic" {
skip "Will fix in a future PR"
make_it
dolt branch -c to_keep to_checkout