Fixed bug determining RETURNING binds in a SQL statement when RETURNING

and INTO keywords are not separated by spaces, but are separated by
other whitespace characters (#104).

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -10,6 +10,14 @@ For deprecations, see :ref:`Deprecations <deprecations>`.
 oracledb 1.2.1 (TBD)
 --------------------
 
+Thin Mode Changes
++++++++++++++++++
+
+#)  Fixed bug determining RETURNING binds in a SQL statement when RETURNING and
+    INTO keywords are not separated by spaces, but are separated by other
+    whitespace characters
+    (`issue 104 <https://github.com/oracle/python-oracledb/issues/104>`__).
+
 Thick Mode Changes
 ++++++++++++++++++
 

src/oracledb/impl/thin/statement.pyx

@@ -43,7 +43,7 @@ BIND_PATTERN = r'(?<!"\:)(?<=\:)\s*("[^\"]*"|[^\W\d_][\w\$#]*|\d+)'
 # pattern used for detecting a DML returning clause; bind variables in the
 # first group are input variables; bind variables in the second group are
 # output only variables
-DML_RETURNING_PATTERN = r'(?si)( RETURNING [\s\S]+ INTO )(.*?$)'
+DML_RETURNING_PATTERN = r'(?si)(\s+RETURNING\s+[\s\S]+\s+INTO\s+)(.*?$)'
 
 cdef class BindInfo:
 

tests/test_1600_dml_returning.py

@@ -399,9 +399,9 @@ def test_1620_dml_returning_with_index_organized_table(self):
         self.cursor.execute("truncate table TestUniversalRowids")
         rowid_var = self.cursor.var(oracledb.ROWID)
         data = (1, "ABC", datetime.datetime(2017, 4, 11), rowid_var)
-        self.cursor.execute("""
-                insert into TestUniversalRowids values (:1, :2, :3)
-                returning rowid into :4""", data)
+        sql = "insert into TestUniversalRowids values (:1, :2, :3)\n" + \
+              "returning rowid into :4"
+        self.cursor.execute(sql, data)
         rowid_value, = rowid_var.getvalue()
         self.cursor.execute("""
                 select * from TestUniversalRowids where rowid = :1""",