cdiscbuilder 1.1.10__py3-none-any.whl → 1.1.11__py3-none-any.whl

cdiscbuilder/adam/adam_derivation/derivations/sql_derivation.py

@@ -92,26 +92,52 @@ class SQLDerivation(BaseDerivation):
             sql_condition = sql_condition.replace("___LT___", f"< {source} AND {source} <")
             sql_condition = sql_condition.replace("___EQ___", f"= {source} AND {source} =")
 
-            # Clean up the condition
-            if condition.startswith("<"):
-                value = condition[1:].strip()
-                case_parts.append(f"WHEN {source} < {value} THEN '{label}'")
-            elif condition.startswith(">=") and " and " in condition.lower():
-                parts = condition.split(" and ")
-                lower = parts[0].replace(">=", "").strip()
+            # Clean up the condition - handle all comparison operators
+            if " and " in condition.lower():
+                # Range condition: handle >=X and <Y, >X and <=Y, etc.
+                parts = condition.lower().split(" and ")
+                lower_part = parts[0].strip()
                 upper_part = parts[1].strip()
-                # Handle both <= and < for upper bound
-                if "<=" in upper_part:
-                    upper = upper_part.replace("<=", "").strip()
-                    case_parts.append(f"WHEN {source} >= {lower} AND {source} <= {upper} THEN '{label}'")
+                
+                # Parse lower bound (>= or >)
+                if lower_part.startswith(">="):
+                    lower_val = lower_part.replace(">=", "").strip()
+                    lower_op = ">="
+                elif lower_part.startswith(">"):
+                    lower_val = lower_part.replace(">", "").strip()
+                    lower_op = ">"
                 else:
-                    upper = upper_part.replace("<", "").strip()
-                    case_parts.append(f"WHEN {source} >= {lower} AND {source} < {upper} THEN '{label}'")
+                    # Fallback for unexpected format
+                    case_parts.append(f"WHEN {condition} THEN '{label}'")
+                    continue
+                
+                # Parse upper bound (<= or <)
+                if upper_part.startswith("<="):
+                    upper_val = upper_part.replace("<=", "").strip()
+                    upper_op = "<="
+                elif upper_part.startswith("<"):
+                    upper_val = upper_part.replace("<", "").strip()
+                    upper_op = "<"
+                else:
+                    # Fallback for unexpected format
+                    case_parts.append(f"WHEN {condition} THEN '{label}'")
+                    continue
+                
+                case_parts.append(f"WHEN {source} {lower_op} {lower_val} AND {source} {upper_op} {upper_val} THEN '{label}'")
+            elif condition.startswith("<="):
+                value = condition[2:].strip()
+                case_parts.append(f"WHEN {source} <= {value} THEN '{label}'")
+            elif condition.startswith("<"):
+                value = condition[1:].strip()
+                case_parts.append(f"WHEN {source} < {value} THEN '{label}'")
             elif condition.startswith(">="):
                 value = condition[2:].strip()
                 case_parts.append(f"WHEN {source} >= {value} THEN '{label}'")
+            elif condition.startswith(">"):
+                value = condition[1:].strip()
+                case_parts.append(f"WHEN {source} > {value} THEN '{label}'")
             else:
-                # Generic condition
+                # Generic condition (pass through as-is)
                 case_parts.append(f"WHEN {condition} THEN '{label}'")
 
         case_expr = "CASE " + " ".join(case_parts) + " ELSE NULL END"

{cdiscbuilder-1.1.10.dist-info → cdiscbuilder-1.1.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdiscbuilder
-Version: 1.1.10
+Version: 1.1.11
 Summary: A package to convert ODM XML to SDTM/ADaM Datasets
 Author-email: Ming-Chun Chen <hellomingchun@gmail.com>
 Requires-Python: >=3.8

{cdiscbuilder-1.1.10.dist-info → cdiscbuilder-1.1.11.dist-info}/RECORD

@@ -7,7 +7,7 @@ cdiscbuilder/adam/adam_derivation/engine.py,sha256=5Wk_tc3c6nRKBiiL5gE7YXxvdPgXV
 cdiscbuilder/adam/adam_derivation/derivations/__init__.py,sha256=iu7xzlQF_uK_5nwYw5ovEsBDNdaX0S8oVFYYxcxheTc,213
 cdiscbuilder/adam/adam_derivation/derivations/base.py,sha256=thbi0UD17Z8hUA5G6np_wWDcFth-UmoY7moS2KzvIps,1242
 cdiscbuilder/adam/adam_derivation/derivations/function_derivation.py,sha256=mPBet5JR10RS9euaS9ZLE1GCMRS3Grp9Gc3hdiQOVDI,7167
-cdiscbuilder/adam/adam_derivation/derivations/sql_derivation.py,sha256=zAQtLlVasXpW_OIc4kNIYy0n3MerGWLZHoFYv7Nu648,24146
+cdiscbuilder/adam/adam_derivation/derivations/sql_derivation.py,sha256=-wd5AZfItJUyTZNUNWQHlheYPESInwijpl0j9tbp7z8,25377
 cdiscbuilder/adam/adam_derivation/functions/__init__.py,sha256=Cv4pLpgHTr9i2zf7owbpZwMyxm8JLFmX4J31dvX0jYg,1773
 cdiscbuilder/adam/adam_derivation/functions/get_bmi.py,sha256=RR1lQpRSDO4cEkhxjnPutAy_xfVvfEwmhYR90XK2eMM,229
 cdiscbuilder/adam/adam_derivation/loaders/__init__.py,sha256=eUnUKzyahIaLIqjn39sYzXvzPpfabZoipkPdQ5mA9IE,116
@@ -49,9 +49,9 @@ cdiscbuilder/sdtm/loader/load.py,sha256=30x9fAEjnuRq313SRq9I7mBwrWl4sEhiKkmrr9x1
 cdiscbuilder/sdtm/loader/tests/__init__.py,sha256=ujCd31KMb52gvkWkVBBogLBda3aiRmbqS0nRS-yTnk0,69
 cdiscbuilder/sdtm/loader/tests/test_load.py,sha256=yrXFQlzH_EkN6HxJc7ItFie8xqwrs2XxwNu2wGaxjok,11180
 cdiscbuilder/tlf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cdiscbuilder-1.1.10.dist-info/licenses/LICENSE,sha256=Da4Pm8tEdB1ycKkAkF2EwfHd-8l0wrJ_uwejzfBRHFE,1092
-cdiscbuilder-1.1.10.dist-info/METADATA,sha256=h2z5jttsHu_kiK74BtigJLWLehp9NupmmSycv5cQ2-Y,357
-cdiscbuilder-1.1.10.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-cdiscbuilder-1.1.10.dist-info/entry_points.txt,sha256=KsuiJD4hsfjRqDkdvWgLFPeQCz7QBl73RA665BmF0Pw,53
-cdiscbuilder-1.1.10.dist-info/top_level.txt,sha256=3x5ENgnXBENgXKp5Zsht_4_OmA5wLVvDuk0UEkYOGNw,13
-cdiscbuilder-1.1.10.dist-info/RECORD,,
+cdiscbuilder-1.1.11.dist-info/licenses/LICENSE,sha256=Da4Pm8tEdB1ycKkAkF2EwfHd-8l0wrJ_uwejzfBRHFE,1092
+cdiscbuilder-1.1.11.dist-info/METADATA,sha256=f60l-5iGXmmj6ThDt5CfALlhwZdstgIlhY179w3JpB8,357
+cdiscbuilder-1.1.11.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+cdiscbuilder-1.1.11.dist-info/entry_points.txt,sha256=KsuiJD4hsfjRqDkdvWgLFPeQCz7QBl73RA665BmF0Pw,53
+cdiscbuilder-1.1.11.dist-info/top_level.txt,sha256=3x5ENgnXBENgXKp5Zsht_4_OmA5wLVvDuk0UEkYOGNw,13
+cdiscbuilder-1.1.11.dist-info/RECORD,,