Fixed bug determining bind variables when found between two comment blocks

(#105).

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -17,6 +17,8 @@ Thin Mode Changes
     INTO keywords are not separated by spaces, but are separated by other
     whitespace characters
     (`issue 104 <https://github.com/oracle/python-oracledb/issues/104>`__).
+#)  Fixed bug determining bind variables when found between two comment blocks
+    (`issue 105 <https://github.com/oracle/python-oracledb/issues/105>`__).
 
 Thick Mode Changes
 ++++++++++++++++++

src/oracledb/impl/thin/statement.pyx

@@ -183,7 +183,7 @@ cdef class Statement:
 
         # Strip single/multiline comments and strings from the sql statement to
         # ease searching for bind variables.
-        sql = re.sub(r"/\*[\S\n ]+\*/", "", sql)
+        sql = re.sub(r"/\*[\S\n ]+?\*/", "", sql)
         sql = re.sub(r"\--.*(\n|$)", "", sql)
         sql = re.sub(r"""'[^']*'(?=(?:[^']*[^']*')*[^']*$)*""", "", sql,
                      flags=re.MULTILINE)

tests/test_4300_cursor_other.py

@@ -814,6 +814,17 @@ def test_4363_multiple_parse(self):
             self.cursor.parse(sql)
             self.cursor.execute(sql, ("Updated value", data[0]))
 
+    def test_4364_binds_between_comment_blocks(self):
+        "4364 - test bindnames() for bind variables between comment blocks"
+        self.cursor.prepare("""
+                select
+                    /* comment 1 */
+                    :a,
+                    /* comment 2 */
+                    :b
+                    /* comment 3 */
+                from dual""")
+        self.assertEqual(self.cursor.bindnames(), ["A", "B"])
 
 if __name__ == "__main__":
     test_env.run_test_cases()