velocity-python 0.0.137__py3-none-any.whl → 0.0.139__py3-none-any.whl

velocity/__init__.py

@@ -1,4 +1,4 @@
-__version__ = version = "0.0.137"
+__version__ = version = "0.0.139"
 
 from . import aws
 from . import db

velocity/db/core/engine.py

@@ -367,12 +367,34 @@ class Engine:
 
         msg = str(exception).strip().lower()
 
-        # Create enhanced error message with SQL query
+        # Create enhanced error message with SQL query and context
         enhanced_message = str(exception)
+        
+        # Add specific guidance for common WHERE clause errors
+        exception_str_lower = str(exception).lower()
+        if "argument of where must be type boolean" in exception_str_lower:
+            enhanced_message += (
+                "\n\n*** WHERE CLAUSE ERROR ***\n"
+                "This error typically occurs when a WHERE clause contains a bare value "
+                "instead of a proper boolean expression.\n"
+                "Common fixes:\n"
+                "  - Change WHERE 1001 to WHERE sys_id = 1001\n"
+                "  - Change WHERE {'column': value} format in dictionaries\n"
+                "  - Ensure string WHERE clauses are complete SQL expressions"
+            )
+        
         if sql:
             enhanced_message += (
                 f"\n\nSQL Query:\n{self._format_sql_with_params(sql, parameters)}"
             )
+            
+        # Add call stack context for better debugging
+        import traceback
+        stack_trace = traceback.format_stack()
+        # Get the last few frames that aren't in the error handling itself
+        relevant_frames = [frame for frame in stack_trace if 'process_error' not in frame and 'logging' not in frame][-3:]
+        if relevant_frames:
+            enhanced_message += "\n\nCall Context:\n" + "".join(relevant_frames)
 
         # Format SQL for logging
         formatted_sql_info = ""

velocity/db/servers/postgres/sql.py

@@ -69,7 +69,7 @@ class SQL(BaseSQLDialect):
 
     default_schema = "public"
 
-    ApplicationErrorCodes = ["22P02", "42883", "42501", "42601", "25P01", "25P02"]
+    ApplicationErrorCodes = ["22P02", "42883", "42501", "42601", "25P01", "25P02", "42804"]  # Added 42804 for datatype mismatch
 
     DatabaseMissingErrorCodes = ["3D000"]
     TableMissingErrorCodes = ["42P01"]
@@ -296,23 +296,37 @@ class SQL(BaseSQLDialect):
         else:
             sql_parts["FROM"].append(TableHelper.quote(table))
 
-        # WHERE
+        # WHERE - Enhanced validation to prevent malformed SQL
         if where:
             if isinstance(where, str):
                 # Validate string WHERE clauses to prevent malformed SQL
-                if where.strip().isdigit() or where.strip() in ('True', 'False'):
+                where_stripped = where.strip()
+                if not where_stripped:
+                    raise ValueError("WHERE clause cannot be empty string.")
+                # Check for boolean literals first (includes '1' and '0')
+                if where_stripped in ('True', 'False', '1', '0'):
                     raise ValueError(
                         f"Invalid WHERE clause: '{where}'. "
-                        "String WHERE clauses must be complete SQL expressions, "
-                        "not bare values. Use a dictionary like {{'column': value}} instead."
+                        "Boolean literals alone are not valid WHERE clauses. "
+                        "Use complete SQL expressions like 'sys_active = true' instead."
+                    )
+                # Then check for other numeric values (excluding '1' and '0' already handled above)
+                elif where_stripped.isdigit():
+                    raise ValueError(
+                        f"Invalid WHERE clause: '{where}'. "
+                        "Bare integers are not valid WHERE clauses. "
+                        "Use a dictionary like {{'sys_id': {where_stripped}}} or "
+                        f"a complete SQL expression like 'sys_id = {where_stripped}' instead."
                     )
                 sql_parts["WHERE"].append(where)
             elif isinstance(where, (int, float, bool)):
                 # Handle primitive types that should be converted to proper WHERE clauses
+                suggested_fix = "{'sys_id': " + str(where) + "}" if isinstance(where, int) else "complete SQL expression"
                 raise ValueError(
                     f"Invalid WHERE clause: {where} (type: {type(where).__name__}). "
-                    "WHERE clauses must be dictionaries like {{'column': value}}, "
-                    "lists of tuples, or complete SQL strings."
+                    f"Primitive values cannot be WHERE clauses directly. "
+                    f"Use a dictionary like {suggested_fix} or a complete SQL string instead. "
+                    f"This error prevents PostgreSQL 'argument of WHERE must be type boolean' errors."
                 )
             elif isinstance(where, Mapping):
                 # Convert dictionary to predicate list
@@ -473,20 +487,34 @@ class SQL(BaseSQLDialect):
                         new_where.append(th.make_predicate(key, val))
                     where = new_where
                 elif isinstance(where, str):
-                    # Validate string WHERE clauses to prevent malformed SQL
-                    if where.strip().isdigit() or where.strip() in ('True', 'False'):
+                    # Enhanced validation for string WHERE clauses
+                    where_stripped = where.strip()
+                    if not where_stripped:
+                        raise ValueError("WHERE clause cannot be empty string.")
+                    # Check for boolean literals first (includes '1' and '0')
+                    if where_stripped in ('True', 'False', '1', '0'):
+                        raise ValueError(
+                            f"Invalid WHERE clause: '{where}'. "
+                            "Boolean literals alone are not valid WHERE clauses. "
+                            "Use complete SQL expressions like 'sys_active = true' instead."
+                        )
+                    # Then check for other numeric values (excluding '1' and '0' already handled above)
+                    elif where_stripped.isdigit():
                         raise ValueError(
                             f"Invalid WHERE clause: '{where}'. "
-                            "String WHERE clauses must be complete SQL expressions, "
-                            "not bare values. Use a dictionary like {{'column': value}} instead."
+                            "Bare integers are not valid WHERE clauses. "
+                            f"Use a dictionary like {{'sys_id': {where_stripped}}} or "
+                            f"a complete SQL expression like 'sys_id = {where_stripped}' instead."
                         )
                     where_clauses.append(where)
                 elif isinstance(where, (int, float, bool)):
                     # Handle primitive types that should be converted to proper WHERE clauses
+                    suggested_fix = "{'sys_id': " + str(where) + "}" if isinstance(where, int) else "complete SQL expression"
                     raise ValueError(
                         f"Invalid WHERE clause: {where} (type: {type(where).__name__}). "
-                        "WHERE clauses must be dictionaries like {{'column': value}}, "
-                        "lists of tuples, or complete SQL strings."
+                        f"Primitive values cannot be WHERE clauses directly. "
+                        f"Use a dictionary like {suggested_fix} or a complete SQL string instead. "
+                        f"This error prevents PostgreSQL 'argument of WHERE must be type boolean' errors."
                     )
                 
                 # Process the where clause if it's a list of tuples

{velocity_python-0.0.137.dist-info → velocity_python-0.0.139.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.0.137
+Version: 0.0.139
 Summary: A rapid application development library for interfacing with data storage
 Author-email: Velocity Team <info@codeclubs.org>
 License-Expression: MIT

{velocity_python-0.0.137.dist-info → velocity_python-0.0.139.dist-info}/RECORD

@@ -1,4 +1,4 @@
-velocity/__init__.py,sha256=dJ_hcpGqD4vtwPKMprWWLtgOPpBULd0G6IibqlXa0PU,147
+velocity/__init__.py,sha256=L8SNZmztZyujsRJgQbqf6eg6XkGBZGRicgx9fXCHSkU,147
 velocity/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 velocity/app/invoices.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 velocity/app/orders.py,sha256=fr1oTBjSFfyeMBUXRG06LV4jgwrlwYNL5mbEBleFwf0,6328
@@ -32,7 +32,7 @@ velocity/db/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 velocity/db/core/column.py,sha256=tAr8tL3a2nyaYpNHhGl508FrY_pGZTzyYgjAV5CEBv4,4092
 velocity/db/core/database.py,sha256=3zNGItklu9tZCKsbx2T2vCcU1so8AL9PPL0DLjvaz6s,3554
 velocity/db/core/decorators.py,sha256=quhjMoEmK_l2jF7jXyL5Fgv8uisIpBz34Au5d3U6UHs,5276
-velocity/db/core/engine.py,sha256=yiqR29oqRo2x4xZvJZIl3bwRSaXTCpp65PXBiK-fuTE,19494
+velocity/db/core/engine.py,sha256=mNlaFPruHO935phKPVrsxZprGYUvxW-zp2sBcBZ-KCg,20666
 velocity/db/core/result.py,sha256=b0ie3yZAOj9S57x32uFFGKZ95zhImmZ0iXl0X1qYszc,12813
 velocity/db/core/row.py,sha256=yqxm03uEDy3oSbnkCtKyiqFdSqG3zXTq2HIHYKOvPY4,7291
 velocity/db/core/sequence.py,sha256=VMBc0ZjGnOaWTwKW6xMNTdP8rZ2umQ8ml4fHTTwuGq4,3904
@@ -53,7 +53,7 @@ velocity/db/servers/mysql/types.py,sha256=BMQf4TpsRo1JN-yOl1nSItTO-Juu2piSTNy5o_
 velocity/db/servers/postgres/__init__.py,sha256=6YcTLXposmsrEaJgdUAM_QgD1TZDSILQrGcwWZ-dibk,2457
 velocity/db/servers/postgres/operators.py,sha256=y9k6enReeR5hJxU_lYYR2epoaw4qCxEqmYJJ5jjaVWA,1166
 velocity/db/servers/postgres/reserved.py,sha256=5tKLaqFV-HrWRj-nsrxl5KGbmeM3ukn_bPZK36XEu8M,3648
-velocity/db/servers/postgres/sql.py,sha256=n6UrrOx2aNEW_b85jd8qF5qjQhEBGgBY21-XrbuhcDo,45152
+velocity/db/servers/postgres/sql.py,sha256=tC-_kl2gYRZKvW5zxOxvdMv0ZXJrO4zpnjcXVuro9q0,47246
 velocity/db/servers/postgres/types.py,sha256=W71x8iRx-IIJkQSjb29k-KGkqp-QS6SxB0BHYXd4k8w,6955
 velocity/db/servers/sqlite/__init__.py,sha256=EIx09YN1-Vm-4CXVcEf9DBgvd8FhIN9rEqIaSRrEcIk,2293
 velocity/db/servers/sqlite/operators.py,sha256=VzZgph8RrnHkIVqqWGqnJwcafgBzc_8ZQp-M8tMl-mw,1221
@@ -121,8 +121,8 @@ velocity/misc/tests/test_merge.py,sha256=Vm5_jY5cVczw0hZF-3TYzmxFw81heJOJB-dvhCg
 velocity/misc/tests/test_oconv.py,sha256=fy4DwWGn_v486r2d_3ACpuBD-K1oOngNq1HJCGH7X-M,4694
 velocity/misc/tests/test_original_error.py,sha256=iWSd18tckOA54LoPQOGV5j9LAz2W-3_ZOwmyZ8-4YQc,1742
 velocity/misc/tests/test_timer.py,sha256=l9nrF84kHaFofvQYKInJmfoqC01wBhsUB18lVBgXCoo,2758
-velocity_python-0.0.137.dist-info/licenses/LICENSE,sha256=aoN245GG8s9oRUU89KNiGTU4_4OtnNmVi4hQeChg6rM,1076
-velocity_python-0.0.137.dist-info/METADATA,sha256=arxFOV5vgFlaiYZpp4IEDENuIMTcDHDb-l1ZenRWl1A,34262
-velocity_python-0.0.137.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-velocity_python-0.0.137.dist-info/top_level.txt,sha256=JW2vJPmodgdgSz7H6yoZvnxF8S3fTMIv-YJWCT1sNW0,9
-velocity_python-0.0.137.dist-info/RECORD,,
+velocity_python-0.0.139.dist-info/licenses/LICENSE,sha256=aoN245GG8s9oRUU89KNiGTU4_4OtnNmVi4hQeChg6rM,1076
+velocity_python-0.0.139.dist-info/METADATA,sha256=aKYd68YkqQOe5FFsjQigptWuCBlh8H7Pbm3XjJZ1ooM,34262
+velocity_python-0.0.139.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+velocity_python-0.0.139.dist-info/top_level.txt,sha256=JW2vJPmodgdgSz7H6yoZvnxF8S3fTMIv-YJWCT1sNW0,9
+velocity_python-0.0.139.dist-info/RECORD,,