Fixed bug which caused some queries with semicolons to crash (#425)

* Remove rstrip of semicolon in mssqlcliclient
* Client and non-interactive tests added

Author: Elliot Boschwitz

mssqlcli/mssqlcliclient.py

@@ -106,7 +106,7 @@ def execute_query(self, query):
             else:
                 for single_query in sqlparse.split(query):
                     # Remove spaces, EOL and semi-colons from end
-                    single_query = single_query.strip().rstrip(';')
+                    single_query = single_query.strip()
                     if single_query:
                         for rows, columns, status, statement, is_error \
                             in self._execute_query(single_query):

tests/test_mssqlcliclient.py

@@ -12,7 +12,9 @@
     create_test_db,
     clean_up_test_db,
     shutdown,
-    random_str
+    random_str,
+    get_io_paths,
+    get_file_contents
 )
 
 
@@ -240,7 +242,20 @@ def test_mssqlcliclient_multiple_statement(client, query_str, rows_outputted):
         for (i, (rows, _, _, query_executed, is_error)) in \
             enumerate(client.execute_query(query_str)):
 
-            queries = query_str.split(';')
+            queries = ["{};".format(query) for query in query_str.split(';')]
             assert query_executed == queries[i].strip()
             assert len(rows) == rows_outputted[i]
             assert (is_error and len(rows) == 0) or (not is_error)
+
+    @staticmethod
+    def test_mssqlcliclient_multiple_merge(client_with_db):
+        """
+        Tests query with multiple merges. Requires creation of temp db.
+        """
+        file_input, _ = get_io_paths('multiple_merge.txt')
+        query_input = get_file_contents(file_input)
+
+        for rows, _, status, _, is_error in client_with_db.execute_query(query_input):
+            if is_error:
+                raise AssertionError("Query execution failed: {}".format(status))
+            assert () == rows

tests/test_noninteractive_mode.py

@@ -6,6 +6,8 @@
 import pytest
 from mssqltestutils import (
     create_mssql_cli,
+    create_test_db,
+    clean_up_test_db,
     random_str,
     shutdown,
     test_queries,
@@ -80,6 +82,25 @@ def test_long_query(tmp_filepath):
         finally:
             shutdown(mssqlcli)
 
+    @pytest.mark.timeout(300)
+    def test_multiple_merge(self):
+        """
+        Tests query with multiple merges. Requires creation of temp db.
+        """
+        try:
+            # create temporary db
+            db_name = create_test_db()
+
+            file_input, file_baseline = get_io_paths('multiple_merge.txt')
+            text_baseline = get_file_contents(file_baseline)
+
+            # test with -i
+            output_query = self.execute_query_via_subprocess("-i {} -d {}"\
+                                                             .format(file_input, db_name))
+            assert output_query == text_baseline
+        finally:
+            clean_up_test_db(db_name)
+
     @classmethod
     @pytest.mark.timeout(60)
     def test_Q_with_i_run(cls):

tests/test_query_baseline/baseline_multiple_merge.txt

@@ -0,0 +1,9 @@
+Commands completed successfully.
+Commands completed successfully.
+(4 rows affected)
+Commands completed successfully.
+Commands completed successfully.
+(5 rows affected)
+(6 rows affected)
+(5 rows affected)
+Commands completed successfully.

tests/test_query_inputs/input_multiple_merge.txt

@@ -0,0 +1,60 @@
+drop table if exists  dbo.category;
+CREATE TABLE dbo.category (
+    category_id INT PRIMARY KEY,
+    category_name VARCHAR(255) NOT NULL,
+    amount DECIMAL(10 , 2 )
+);
+
+INSERT INTO dbo.category(category_id, category_name, amount)
+VALUES(1,'Children Bicycles',15000),
+    (2,'Comfort Bicycles',25000),
+    (3,'Cruisers Bicycles',13000),
+    (4,'Cyclocross Bicycles',10000);
+
+drop table if exists dbo.category_staging;
+CREATE TABLE dbo.category_staging (
+    category_id INT PRIMARY KEY,
+    category_name VARCHAR(255) NOT NULL,
+    amount DECIMAL(10 , 2 )
+);
+
+INSERT INTO dbo.category_staging(category_id, category_name, amount)
+VALUES(1,'Children Bicycles',15000),
+    (3,'Cruisers Bicycles',13000),
+    (4,'Cyclocross Bicycles',20000),
+    (5,'Electric Bikes',10000),
+    (6,'Mountain Bikes',10000);
+
+
+go
+
+--Do the merge
+MERGE dbo.category t
+    USING dbo.category_staging s
+ON (s.category_id = t.category_id)
+WHEN MATCHED
+    THEN UPDATE SET
+        t.category_name = s.category_name,
+        t.amount = s.amount
+WHEN NOT MATCHED BY TARGET
+    THEN INSERT (category_id, category_name, amount)
+         VALUES (s.category_id, s.category_name, s.amount)
+WHEN NOT MATCHED BY SOURCE
+    THEN DELETE;
+
+go
+
+--Do the exact same statement (cut/pasted)
+MERGE dbo.category t
+    USING dbo.category_staging s
+ON (s.category_id = t.category_id)
+WHEN MATCHED
+    THEN UPDATE SET
+        t.category_name = s.category_name,
+        t.amount = s.amount
+WHEN NOT MATCHED BY TARGET
+    THEN INSERT (category_id, category_name, amount)
+         VALUES (s.category_id, s.category_name, s.amount)
+WHEN NOT MATCHED BY SOURCE
+    THEN DELETE;
+go