Merge pull request #406 from tmaeno/master

MINUS in Oracle -> EXCEPT on Postgres
PanDAWMS · Sep 10, 2024 · 27c6f6d · 27c6f6d
2 parents 5cc5a72 + 4ba3ebe
commit 27c6f6d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/PandaPkgInfo.py b/PandaPkgInfo.py
@@ -1 +1 @@
-release_version = "0.3.20"
+release_version = "0.3.21"
diff --git a/pandaserver/taskbuffer/WrappedCursor.py b/pandaserver/taskbuffer/WrappedCursor.py
@@ -48,6 +48,8 @@ def convert_query_in_printf_format(sql, var_dict, sql_conv_map):
         sql = re.sub(r"NVL\(", r"COALESCE(", sql, flags=re.IGNORECASE)
         # random
         sql = re.sub(r"DBMS_RANDOM.value", r"RANDOM()", sql, flags=re.IGNORECASE)
+        # MINUS
+        sql = re.sub(r" MINUS ", r" EXCEPT ", sql, flags=re.IGNORECASE)
         # GENERATE_SERIES
         sql = re.sub(
             r"\(SELECT\s+level\s+FROM\s+dual\s+CONNECT\s+BY\s+level\s*<=\s*(:[^ \)]+)\)*",