sql-data-guard 0.1.1__tar.gz → 0.1.3__tar.gz

{sql_data_guard-0.1.1/src/sql_data_guard.egg-info → sql_data_guard-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sql-data-guard
-Version: 0.1.1
+Version: 0.1.3
 Summary: Safety Layer for LLM Database Interactions
 Author-email: Imperva - Threat Reseach Infra <ww.dis.imperva.threat-research-infra@thalesgroup.com>
 License: MIT License
@@ -93,6 +93,9 @@ Output:
     "fixed": "SELECT id, product_name, account_id FROM orders WHERE account_id = 123"
 }
 ```
+For more details on restriction rules and validation, see the [manual.](docs/manual.md)
+
+
 Here is a table with more examples of SQL queries and their corresponding JSON outputs:
 
 | SQL Query                                               | JSON Output                                                                                                                                                                         |
@@ -111,24 +114,6 @@ To install sql-data-guard, use pip:
 ```bash
 pip install sql-data-guard
 ```
-## Restriction Schema and Validation
-
-Restrictions are used to validate queries by ensuring that only supported operations are applied to table columns. The `validate_restrictions` function enforces these rules, allowing only specific operations and ensuring correct formats.
-## **Supported Operations**
-- `=` (Equal to)  
-- `>` (Greater than)  
-- `<` (Less than)  
-- `>=` (Greater than or equal to)  
-- `<=` (Less than or equal to)  
-- `BETWEEN` (Range validation)  
-- `IN` (List validation)  
-
-## **Example for Restriction**
-```
-  "column": "price",
-  "operation": ">=",
-  "value": 100
-  ```
 
 ## Docker Repository
 
@@ -167,4 +152,4 @@ curl -X POST http://localhost:5000/verify-sql \
 We welcome contributions! Please see our [CONTRIBUTING.md](https://raw.githubusercontent.com/ThalesGroup/sql-data-guard/main/CONTRIBUTING.md) for more details.
 
 ## License
-This project is licensed under the MIT License. See the [LICENSE.md](LICENSE) file for details.
+This project is licensed under the MIT License. See the [LICENSE.md](https://raw.githubusercontent.com/ThalesGroup/sql-data-guard/main/LICENSE.md) file for details.

{sql_data_guard-0.1.1 → sql_data_guard-0.1.3}/README.md

@@ -69,6 +69,9 @@ Output:
     "fixed": "SELECT id, product_name, account_id FROM orders WHERE account_id = 123"
 }
 ```
+For more details on restriction rules and validation, see the [manual.](docs/manual.md)
+
+
 Here is a table with more examples of SQL queries and their corresponding JSON outputs:
 
 | SQL Query                                               | JSON Output                                                                                                                                                                         |
@@ -87,24 +90,6 @@ To install sql-data-guard, use pip:
 ```bash
 pip install sql-data-guard
 ```
-## Restriction Schema and Validation
-
-Restrictions are used to validate queries by ensuring that only supported operations are applied to table columns. The `validate_restrictions` function enforces these rules, allowing only specific operations and ensuring correct formats.
-## **Supported Operations**
-- `=` (Equal to)  
-- `>` (Greater than)  
-- `<` (Less than)  
-- `>=` (Greater than or equal to)  
-- `<=` (Less than or equal to)  
-- `BETWEEN` (Range validation)  
-- `IN` (List validation)  
-
-## **Example for Restriction**
-```
-  "column": "price",
-  "operation": ">=",
-  "value": 100
-  ```
 
 ## Docker Repository
 
@@ -143,4 +128,4 @@ curl -X POST http://localhost:5000/verify-sql \
 We welcome contributions! Please see our [CONTRIBUTING.md](https://raw.githubusercontent.com/ThalesGroup/sql-data-guard/main/CONTRIBUTING.md) for more details.
 
 ## License
-This project is licensed under the MIT License. See the [LICENSE.md](LICENSE) file for details.
+This project is licensed under the MIT License. See the [LICENSE.md](https://raw.githubusercontent.com/ThalesGroup/sql-data-guard/main/LICENSE.md) file for details.

{sql_data_guard-0.1.1 → sql_data_guard-0.1.3}/pyproject.toml

@@ -9,7 +9,7 @@ package-dir = {"" = "src"}
 extra-index-url = ["https://pypi.org/simple"]
 [project]
 name = "sql-data-guard"
-version = "0.1.1"
+version = "0.1.3"
 dependencies = [
     "sqlglot"
 ]

{sql_data_guard-0.1.1 → sql_data_guard-0.1.3}/src/sql_data_guard/restriction_verification.py

@@ -70,7 +70,7 @@ def _create_new_condition(
     """
     if restriction.get("operation") == "BETWEEN":
         operator = "BETWEEN"
-        operand = f"{_format_value(restriction["values"][0])} AND {_format_value(restriction["values"][1])}"
+        operand = f"{_format_value(restriction['values'][0])} AND {_format_value(restriction['values'][1])}"
     elif restriction.get("operation") == "IN":
         operator = "IN"
         values = restriction.get("values", [restriction.get("value")])

{sql_data_guard-0.1.1 → sql_data_guard-0.1.3}/src/sql_data_guard/sql_data_guard.py

@@ -135,6 +135,10 @@ def _verify_query_statement(query_statement: expr.Query, context: VerificationCo
     for cte in query_statement.ctes:
         _add_table_alias(cte, context)
         _verify_query_statement(cte.this, context)
+    where_clause = query_statement.find(expr.Where)
+    if where_clause:
+        for sub in where_clause.find_all(expr.Subquery):
+            _verify_query_statement(sub.this, context)
     from_tables = _get_from_clause_tables(query_statement, context)
     for t in from_tables:
         found = False
@@ -251,8 +255,8 @@ def _get_from_clause_tables(
     """
     result = []
     from_clause = select_clause.find(expr.From)
-    join_clause = select_clause.find(expr.Join)
-    for clause in [from_clause, join_clause]:
+    join_clauses = select_clause.args.get("joins", [])
+    for clause in [from_clause] + join_clauses:
         if clause:
             for t in find_direct(clause, expr.Table):
                 if isinstance(t, expr.Table):
@@ -260,7 +264,7 @@ def _get_from_clause_tables(
             for l in find_direct(clause, expr.Subquery):
                 _add_table_alias(l, context)
                 _verify_query_statement(l.this, context)
-    if join_clause:
+    for join_clause in join_clauses:
         for l in find_direct(join_clause, expr.Lateral):
             _add_table_alias(l, context)
             _verify_query_statement(l.this.find(expr.Select), context)

{sql_data_guard-0.1.1 → sql_data_guard-0.1.3/src/sql_data_guard.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sql-data-guard
-Version: 0.1.1
+Version: 0.1.3
 Summary: Safety Layer for LLM Database Interactions
 Author-email: Imperva - Threat Reseach Infra <ww.dis.imperva.threat-research-infra@thalesgroup.com>
 License: MIT License
@@ -93,6 +93,9 @@ Output:
     "fixed": "SELECT id, product_name, account_id FROM orders WHERE account_id = 123"
 }
 ```
+For more details on restriction rules and validation, see the [manual.](docs/manual.md)
+
+
 Here is a table with more examples of SQL queries and their corresponding JSON outputs:
 
 | SQL Query                                               | JSON Output                                                                                                                                                                         |
@@ -111,24 +114,6 @@ To install sql-data-guard, use pip:
 ```bash
 pip install sql-data-guard
 ```
-## Restriction Schema and Validation
-
-Restrictions are used to validate queries by ensuring that only supported operations are applied to table columns. The `validate_restrictions` function enforces these rules, allowing only specific operations and ensuring correct formats.
-## **Supported Operations**
-- `=` (Equal to)  
-- `>` (Greater than)  
-- `<` (Less than)  
-- `>=` (Greater than or equal to)  
-- `<=` (Less than or equal to)  
-- `BETWEEN` (Range validation)  
-- `IN` (List validation)  
-
-## **Example for Restriction**
-```
-  "column": "price",
-  "operation": ">=",
-  "value": 100
-  ```
 
 ## Docker Repository
 
@@ -167,4 +152,4 @@ curl -X POST http://localhost:5000/verify-sql \
 We welcome contributions! Please see our [CONTRIBUTING.md](https://raw.githubusercontent.com/ThalesGroup/sql-data-guard/main/CONTRIBUTING.md) for more details.
 
 ## License
-This project is licensed under the MIT License. See the [LICENSE.md](LICENSE) file for details.
+This project is licensed under the MIT License. See the [LICENSE.md](https://raw.githubusercontent.com/ThalesGroup/sql-data-guard/main/LICENSE.md) file for details.

{sql_data_guard-0.1.1 → sql_data_guard-0.1.3}/test/test_sql_guard_unit.py

@@ -252,6 +252,7 @@ INSERT INTO orders (order_id, account_id, product_id) VALUES
         COUNT(o.order_id) AS order_count
     FROM orders o    
     JOIN products p ON o.product_id = p.product_id
+    WHERE o.account_id = 123
     GROUP BY o.account_id, p.product_name
 ),
 RankedProducts AS (
@@ -273,11 +274,16 @@ FROM OrderCounts oc
 JOIN RankedProducts rp ON oc.product_name = rp.product_name
 WHERE oc.account_id IN (
     -- Filter accounts with at least 2 orders
-    SELECT account_id FROM orders GROUP BY account_id HAVING COUNT(order_id) >= 2
+    SELECT account_id FROM orders
+    WHERE account_id = 123
+    GROUP BY account_id HAVING COUNT(order_id) >= 2
 )
 ORDER BY oc.account_id, rp.product_rank;"""
-        verify_sql_test_data(
-            sql, config, cnn, [(123, "Laptop", 1, 1), (123, "Smartphone", 1, 1)]
+        verify_sql_test(
+            sql,
+            config,
+            cnn=cnn,
+            data=[(123, "Laptop", 1, 1), (123, "Smartphone", 1, 1)],
         )