From fc2e07ed6bdb535d7b72b7118ac52e5897e5e985 Mon Sep 17 00:00:00 2001 From: James Cor Date: Thu, 22 Sep 2022 16:16:46 -0700 Subject: [PATCH 1/5] fixing test --- integration-tests/mysql-client-tests/node/concurrency.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/mysql-client-tests/node/concurrency.js b/integration-tests/mysql-client-tests/node/concurrency.js index 53a25c57a0..3f4ab362af 100644 --- a/integration-tests/mysql-client-tests/node/concurrency.js +++ b/integration-tests/mysql-client-tests/node/concurrency.js @@ -47,7 +47,7 @@ async function insertAuthor(name) { try { await conn.execute('start transaction'); await conn.execute('INSERT INTO users (name) VALUES(?);', [name]); - await conn.execute(`call dolt_commit('-am', 'created author ?')`, [name]); + await conn.execute(`call dolt_commit('-am', concat('created author', ?))`, [name]); } catch (err) { console.error(`Error committing ${name}:`, err); process.exit(1) From b9feb14941d260f35041f36de8710fc1c28717ee Mon Sep 17 00:00:00 2001 From: James Cor Date: Thu, 22 Sep 2022 16:35:42 -0700 Subject: [PATCH 2/5] adding test --- .../sqle/enginetest/dolt_engine_test.go | 7 +++++++ .../doltcore/sqle/enginetest/dolt_queries.go | 17 +++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go index 7f6761764d..deee8f956b 100644 --- a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go @@ -1230,6 +1230,13 @@ func TestDoltCommit(t *testing.T) { } } +func TestDoltCommitPrepared(t *testing.T) { + harness := newDoltHarness(t) + for _, script := range DoltCommitTests { + enginetest.TestScriptPrepared(t, harness, script) + } +} + func TestQueriesPrepared(t *testing.T) { enginetest.TestQueriesPrepared(t, newDoltHarness(t)) } diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_queries.go b/go/libraries/doltcore/sqle/enginetest/dolt_queries.go index 3d9f502521..42b4dbbc1e 100644 --- a/go/libraries/doltcore/sqle/enginetest/dolt_queries.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_queries.go @@ -6313,4 +6313,21 @@ var DoltCommitTests = []queries.ScriptTest{ }, }, }, + { + Name: "CALL DOLT_COMMIT('-ALL') adds all tables (including new ones) to the commit.", + SetUpScript: []string{ + "CREATE table t (pk int primary key);", + "INSERT INTO t VALUES (1);", + "CALL DOLT_ADD('t');", + "CALL DOLT_COMMIT('-m', concat('author: ','somebody'));", + }, + Assertions: []queries.ScriptTestAssertion{ + { + Query: "SELECT message from dolt_log LIMIT 1", + Expected: []sql.Row{ + {"author: somebody"}, + }, + }, + }, + }, } From 089b552799ee9f4c030c9a0585f3122d00a01cca Mon Sep 17 00:00:00 2001 From: James Cor Date: Fri, 23 Sep 2022 10:14:44 -0700 Subject: [PATCH 3/5] updating prepareds count --- go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go index deee8f956b..be741b29d5 100644 --- a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go @@ -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 = 80 +const SkipPreparedsCount = 81 const skipPreparedFlag = "DOLT_SKIP_PREPARED_ENGINETESTS" From 1688eca1cc93ea4bbd14e30a7a08d0bf50a8be31 Mon Sep 17 00:00:00 2001 From: James Cor Date: Fri, 23 Sep 2022 10:19:34 -0700 Subject: [PATCH 4/5] this number is right --- go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go index be741b29d5..611b33204d 100644 --- a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go @@ -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 = 81 +const SkipPreparedsCount = 78 const skipPreparedFlag = "DOLT_SKIP_PREPARED_ENGINETESTS" From ae89e8e08d70c3ab8df7e57ec0f436c300a84cc8 Mon Sep 17 00:00:00 2001 From: James Cor Date: Fri, 23 Sep 2022 10:26:23 -0700 Subject: [PATCH 5/5] i am good at counting --- go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go | 2 +- go/libraries/doltcore/sqle/enginetest/dolt_queries.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go index 611b33204d..9dc204f2cb 100644 --- a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go @@ -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 = 78 +const SkipPreparedsCount = 79 const skipPreparedFlag = "DOLT_SKIP_PREPARED_ENGINETESTS" diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_queries.go b/go/libraries/doltcore/sqle/enginetest/dolt_queries.go index 42b4dbbc1e..90c45f0a7c 100644 --- a/go/libraries/doltcore/sqle/enginetest/dolt_queries.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_queries.go @@ -6314,7 +6314,7 @@ var DoltCommitTests = []queries.ScriptTest{ }, }, { - Name: "CALL DOLT_COMMIT('-ALL') adds all tables (including new ones) to the commit.", + Name: "dolt commit works with arguments", SetUpScript: []string{ "CREATE table t (pk int primary key);", "INSERT INTO t VALUES (1);", @@ -6323,7 +6323,7 @@ var DoltCommitTests = []queries.ScriptTest{ }, Assertions: []queries.ScriptTestAssertion{ { - Query: "SELECT message from dolt_log LIMIT 1", + Query: "SELECT message from dolt_log where message = 'author: somebody'", Expected: []sql.Row{ {"author: somebody"}, },