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

Updating from new schema conflict reporting

Browse Source
This commit is contained in:
Jason Fulghum
2023-04-25 11:57:44 -07:00
parent ecf9d4bf9b
commit 5ba39bec7c
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/libraries/doltcore/sqle/enginetest/dolt_queries_merge.go
+10 -3
View File
@@ -4203,10 +4203,17 @@ var ThreeWayMergeWithSchemaChangeTestScripts = []MergeScriptTest{
},
Assertions: []queries.ScriptTestAssertion{
{
Query: "call dolt_merge('right');",
ExpectedErr: merge.ErrSchemaConflict,
Query: "call dolt_merge('right');",
Expected: []sql.Row{{0, 1}},
},
{
Query: "select table_name, base_schema, our_schema, their_schema from dolt_schema_conflicts;",
Expected: []sql.Row{{"t",
"CREATE TABLE `t` (\n `pk` int NOT NULL,\n `col1` int,\n `col2` varchar(100),\n PRIMARY KEY (`pk`)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin;",
"CREATE TABLE `t` (\n `pk` int NOT NULL,\n `col1` int,\n `col2` varchar(100),\n PRIMARY KEY (`pk`),\n KEY `idx1` (`col2`)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin;",
"CREATE TABLE `t` (\n `pk` int NOT NULL,\n `col1` int,\n `col2` varchar(100),\n PRIMARY KEY (`pk`),\n KEY `idx1` (`col2`)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin;",
}},
},
// TODO: Check dolt_schema_conflicts table for the conflict metadata once that sys table exists
},
},