add hash column to result set for dolt_merge(..., '--no-ff') (#6163)

2026-04-23 21:59:01 -05:00 · 2023-06-16 01:39:03 -07:00
parent 48e336af23
commit 4d2dbb9746
14 changed files with 535 additions and 500 deletions
@@ -1,67 +1,67 @@
-import sqlalchemy
-
-from sqlalchemy.engine import Engine
-from sqlalchemy import create_engine
-
-import sys
-
-QUERY_RESPONSE = [
-    {"create table test (pk int, `value` int, primary key(pk))": []},
-    {"describe test": [
-        ('pk', 'int', 'NO', 'PRI', 'NULL', ''),
-        ('value', 'int', 'YES', '', 'NULL', '')
-    ]},
-    {"insert into test (pk, `value`) values (0,0)": ()},
-    {"select * from test": [(0, 0)]},
-    {"call dolt_add('-A');": [(0,)]},
-    {"call dolt_commit('-m', 'my commit')": [('',)]},
-    {"select COUNT(*) FROM dolt_log": [(2,)]},
-    {"call dolt_checkout('-b', 'mybranch')": [(0,)]},
-    {"insert into test (pk, `value`) values (1,1)": []},
-    {"call dolt_commit('-a', '-m', 'my commit2')": [('',)]},
-    {"call dolt_checkout('main')": [(0,)]},
-    {"call dolt_merge('mybranch')": [(1,0,)]},
-    {"select COUNT(*) FROM dolt_log": [(3,)]},
-]
-
-
-def main():
-    user = sys.argv[1]
-    port = int(sys.argv[2])
-    db = sys.argv[3]
-
-    conn_string_base = "mysql+mysqlconnector://"
-
-    engine = create_engine(conn_string_base +
-                           "{user}@127.0.0.1:{port}/{db}".format(user=user,
-                                                                 port=port,
-                                                                 db=db)
-                           )
-
-    with engine.connect() as con:
-        for query_response in QUERY_RESPONSE:
-            query = list(query_response.keys())[0]
-            exp_results = query_response[query]
-
-            result_proxy = con.execute(query)
-
-            try:
-                results = result_proxy.fetchall()
-                if (results != exp_results) and ("dolt_commit" not in query):
-                    print("Query:")
-                    print(query)
-                    print("Expected:")
-                    print(exp_results)
-                    print("Received:")
-                    print(results)
-                    exit(1)
-            # You can't call fetchall on an insert
-            # so we'll just ignore the exception
-            except sqlalchemy.exc.ResourceClosedError:
-                pass
-
-    con.close()
-    exit(0)
-
-
-main()
+import sqlalchemy
+
+from sqlalchemy.engine import Engine
+from sqlalchemy import create_engine
+
+import sys
+
+QUERY_RESPONSE = [
+    {"create table test (pk int, `value` int, primary key(pk))": []},
+    {"describe test": [
+        ('pk', 'int', 'NO', 'PRI', 'NULL', ''),
+        ('value', 'int', 'YES', '', 'NULL', '')
+    ]},
+    {"insert into test (pk, `value`) values (0,0)": ()},
+    {"select * from test": [(0, 0)]},
+    {"call dolt_add('-A');": [(0,)]},
+    {"call dolt_commit('-m', 'my commit')": [('',)]},
+    {"select COUNT(*) FROM dolt_log": [(2,)]},
+    {"call dolt_checkout('-b', 'mybranch')": [(0,)]},
+    {"insert into test (pk, `value`) values (1,1)": []},
+    {"call dolt_commit('-a', '-m', 'my commit2')": [('',)]},
+    {"call dolt_checkout('main')": [(0,)]},
+    {"call dolt_merge('mybranch')": [('',1,0,)]},
+    {"select COUNT(*) FROM dolt_log": [(3,)]},
+]
+
+
+def main():
+    user = sys.argv[1]
+    port = int(sys.argv[2])
+    db = sys.argv[3]
+
+    conn_string_base = "mysql+mysqlconnector://"
+
+    engine = create_engine(conn_string_base +
+                           "{user}@127.0.0.1:{port}/{db}".format(user=user,
+                                                                 port=port,
+                                                                 db=db)
+                           )
+
+    with engine.connect() as con:
+        for query_response in QUERY_RESPONSE:
+            query = list(query_response.keys())[0]
+            exp_results = query_response[query]
+
+            result_proxy = con.execute(query)
+
+            try:
+                results = result_proxy.fetchall()
+                if (results != exp_results) and ("dolt_commit" not in query):
+                    print("Query:")
+                    print(query)
+                    print("Expected:")
+                    print(exp_results)
+                    print("Received:")
+                    print(results)
+                    exit(1)
+            # You can't call fetchall on an insert
+            # so we'll just ignore the exception
+            except sqlalchemy.exc.ResourceClosedError:
+                pass
+
+    con.close()
+    exit(0)
+
+
+main()