Merge pull request #245

fix #243 - parsing SQL scripts with semicolons and escaped single quotes

Author: amochin

src/DatabaseLibrary/query.py

@@ -346,7 +346,6 @@ def execute_sql_script(
                             # check if the semicolon is a part of the value (quoted string)
                             quotes += sqlFragment.count("'")
                             quotes -= sqlFragment.count("\\'")
-                            quotes -= sqlFragment.count("''")
                             inside_quoted_string = quotes % 2 != 0
                             if inside_quoted_string:
                                 sqlFragment += ";"  # restore the semicolon

test/resources/script_file_tests/semicolons_and_quotes_in_values.sql

@@ -1 +1,2 @@
-INSERT INTO person VALUES(5, 'Miles', 'O''Brian');
+INSERT INTO person VALUES(5, 'Miles', 'O''Brian');
+INSERT INTO person VALUES(6, 'Keiko', 'O''Brian');

test/tests/common_tests/script_files.robot

@@ -29,10 +29,11 @@ Semicolons In Values
 Semicolons And Quotes In Values
     Run SQL Script File    semicolons_and_quotes_in_values
     ${sql}=    Catenate    select * from person
-    ...    where id=5
+    ...    where LAST_NAME='O''Brian'
     ${results}=    Query    ${sql}
-    Length Should Be    ${results}    1
+    Length Should Be    ${results}    2
     Should Be Equal As Strings    ${results}[0]    (5, 'Miles', "O'Brian")
+    Should Be Equal As Strings    ${results}[1]    (6, 'Keiko', "O'Brian")
 
 
 *** Keywords ***