This is an automated email from the ASF dual-hosted git repository.
rom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 1badaec151 Fix oracle bulk insert issue when leftover chunk is empty
(#43467)
1badaec151 is described below
commit 1badaec1515b19bfff4a34c329db22efecf2e282
Author: rom sharon <[email protected]>
AuthorDate: Tue Oct 29 18:06:49 2024 +0200
Fix oracle bulk insert issue when leftover chunk is empty (#43467)
* Fix oracle bulk insert issue when leftover chunk is empty
* add tests
* revert change in test_callproc_none
---------
Co-authored-by: mohammad.fatemi <[email protected]>
---
providers/src/airflow/providers/oracle/hooks/oracle.py | 9 +++++----
providers/tests/oracle/hooks/test_oracle.py | 18 ++++++++++++++++++
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/providers/src/airflow/providers/oracle/hooks/oracle.py
b/providers/src/airflow/providers/oracle/hooks/oracle.py
index 3c51fe31c8..192a2da4b1 100644
--- a/providers/src/airflow/providers/oracle/hooks/oracle.py
+++ b/providers/src/airflow/providers/oracle/hooks/oracle.py
@@ -390,10 +390,11 @@ class OracleHook(DbApiHook):
# Empty chunk
row_chunk = []
# Commit the leftover chunk
- cursor.prepare(prepared_stm)
- cursor.executemany(None, row_chunk)
- conn.commit() # type: ignore[attr-defined]
- self.log.info("[%s] inserted %s rows", table, row_count)
+ if row_chunk:
+ cursor.prepare(prepared_stm)
+ cursor.executemany(None, row_chunk)
+ conn.commit() # type: ignore[attr-defined]
+ self.log.info("[%s] inserted %s rows", table, row_count)
cursor.close()
conn.close() # type: ignore[attr-defined]
diff --git a/providers/tests/oracle/hooks/test_oracle.py
b/providers/tests/oracle/hooks/test_oracle.py
index 2650d8f7ca..9f86df3013 100644
--- a/providers/tests/oracle/hooks/test_oracle.py
+++ b/providers/tests/oracle/hooks/test_oracle.py
@@ -399,6 +399,24 @@ class TestOracleHook:
"table", rows, target_fields, sequence_column=sequence_column,
sequence_name=sequence_name
)
+ def test_bulk_insert_commit_leftovers_only_if_exists(self):
+ rows = [(1, 2, 3), (4, 5, 6), (7, 8, 9), (1, 2, 3), (4, 5, 6), (7, 8,
9)]
+ target_fields = ["col1", "col2", "col3"]
+ sequence_column = "id"
+ sequence_name = "my_sequence"
+
+ self.db_hook.bulk_insert_rows(
+ "table",
+ rows,
+ target_fields,
+ sequence_column=sequence_column,
+ sequence_name=sequence_name,
+ commit_every=3,
+ )
+
+ # executemany should be called exactly 2 times because there is no
leftovers
+ assert self.cur.executemany.call_count == 2
+
def test_callproc_none(self):
parameters = None