Fixed bug determining RETURNING binds in a SQL statement when RETURNING

and INTO keywords are not separated by whitespace, but are separated by
parentheses.

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -46,6 +46,9 @@ Thin Mode Changes
     potentially exceed the 32767 byte limit but the actual value bound does not
     (`issue 146 <https://github.com/oracle/python-oracledb/issues/146>`__).
 #)  Fixed bug connecting to an IPv6 address with IAM tokens.
+#)  Fixed bug determining RETURNING binds in a SQL statement when RETURNING and
+    INTO keywords are not separated by whitespace, but are separated by
+    parentheses.
 #)  Internal implementation changes:
 
     - Added internal support for prefetching the LOB size and chunk size,

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)([)\s]RETURNING\s+[\s\S]+\s+INTO\s+)(.*?$)'
+DML_RETURNING_PATTERN = r'(?si)([)\s]RETURNING[(\s][\s\S]+[)\s]INTO\s+)(.*?$)'
 
 cdef class BindInfo:
 

tests/test_1600_dml_returning.py

@@ -424,5 +424,14 @@ def test_1621_plsql_returning_rowids_with_index_organized_table(self):
         row, = self.cursor.fetchall()
         self.assertEqual(data[:3], row)
 
+    def test_1622_parse_returning_clause_without_spaces(self):
+        "1622 - parse DML returning with no spaces"
+        self.cursor.execute("truncate table TestTempTable")
+        sql = 'insert into TestTempTable (IntCol) values (:in_val)' + \
+              'returning(IntCol)into :out_val'
+        out_val = self.cursor.var(int, arraysize=5)
+        self.cursor.execute(sql, in_val=25, out_val=out_val)
+        self.assertEqual(out_val.getvalue(), [25])
+
 if __name__ == "__main__":
     test_env.run_test_cases()