mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-30 11:31:37 -05:00
Code Issues Packages Projects Releases 159 Wiki Activity

return commit hash for dolt_merge() when --no-ff is not specified (#6281)

Browse Source
This commit is contained in:
James Cor
2023-07-10 02:12:01 -07:00
committed by GitHub
parent 106799fe00
commit ea9839f524
7 changed files with 220 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-tests/mysql-client-tests/python/mysql.connector-test.py
+1 -1
View File
@@ -47,7 +47,7 @@ def main():
results = cursor.fetchall()
print(exp_results)
print(results)
if (results != exp_results) and ("dolt_commit" not in query):
if (results != exp_results) and ("dolt_commit" not in query) and ("dolt_merge" not in query):
print("Query:")
print(query)
print("Expected:")
integration-tests/mysql-client-tests/python/pymysql-test.py
+1 -1
View File
@@ -37,7 +37,7 @@ def main():
with connection.cursor() as cursor:
cursor.execute(query)
results = cursor.fetchall()
if (results != exp_results) and ("dolt_commit" not in query):
if (results != exp_results) and ("dolt_commit" not in query) and ("dolt_merge" not in query):
print("Query:")
print(query)
print("Expected:")
integration-tests/mysql-client-tests/python/sqlalchemy-test.py
+1 -1
View File
@@ -47,7 +47,7 @@ def main():
try:
results = result_proxy.fetchall()
if (results != exp_results) and ("dolt_commit" not in query):
if (results != exp_results) and ("dolt_commit" not in query) and ("dolt_merge" not in query):
print("Query:")
print(query)
print("Expected:")