From 4418ef1beebf5e0880fd0ddae385ae7b903bd666 Mon Sep 17 00:00:00 2001 From: Zach Musgrave Date: Thu, 5 Dec 2024 15:17:42 -0800 Subject: [PATCH] Altered merge queries to be more compatible with doltgres --- go/libraries/doltcore/sqle/enginetest/dolt_queries_merge.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_queries_merge.go b/go/libraries/doltcore/sqle/enginetest/dolt_queries_merge.go index e615f7691f..c72472b3cf 100644 --- a/go/libraries/doltcore/sqle/enginetest/dolt_queries_merge.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_queries_merge.go @@ -1661,7 +1661,7 @@ var MergeScripts = []queries.ScriptTest{ Expected: []sql.Row{{doltCommit, 1, 0, "merge successful"}}, }, { - Query: "INSERT INTO t VALUES (NULL,5),(6,6),(NULL,7);", + Query: "INSERT INTO t(c0) VALUES (5),(6),(7);", Expected: []sql.Row{{types.OkResult{RowsAffected: 3, InsertID: 5}}}, }, { @@ -1698,7 +1698,7 @@ var MergeScripts = []queries.ScriptTest{ Expected: []sql.Row{{doltCommit, 0, 0, "merge successful"}}, }, { - Query: "INSERT INTO t VALUES (NULL,6),(7,7),(NULL,8);", + Query: "INSERT INTO t(c0) VALUES (6),(7),(8);", Expected: []sql.Row{{types.OkResult{RowsAffected: 3, InsertID: 6}}}, }, {