flask-postgresql-audit 1.0.1__tar.gz → 1.0.3__tar.gz

{flask_postgresql_audit-1.0.1 → flask_postgresql_audit-1.0.3}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: flask-postgresql_audit
-Version: 1.0.1
+Version: 1.0.3
 Summary: Versioning and auditing extension for PostgreSQL and SQLAlchemy.
 Project-URL: Homepage, https://github.com/higamigu/flask-postgresql-audit
-Author-email: Refian Muhammad <higamigu@gmail.com>, Konsta Vesterinen <konsta@fastmonkeys.com>
+Author-email: Higamigu <higamigu@gmail.com>, Konsta Vesterinen <konsta@fastmonkeys.com>
 License-Expression: BSD-2-Clause
 License-File: LICENSE
 Classifier: Environment :: Web Environment

{flask_postgresql_audit-1.0.1 → flask_postgresql_audit-1.0.3}/flask_postgresql_audit/__init__.py

@@ -1,4 +1,4 @@
 # ruff: noqa: F401
 from .core import Audit, PostgreSQLAudit
 
-__version__ = "1.0.1"
+__version__ = "1.0.3"

{flask_postgresql_audit-1.0.1 → flask_postgresql_audit-1.0.3}/flask_postgresql_audit/alembic/entities.py

@@ -56,6 +56,7 @@ def get_setting_factory(**context):
 
 
 def jsonb_subtract_factory(**context):
+    context.setdefault("jsonb_subtract_join_type", "LEFT")
     sql = parse_template("jsonb_subtract.sql", **context)
     return PGFunction(
         schema=context["schema_name"],

{flask_postgresql_audit-1.0.1 → flask_postgresql_audit-1.0.3}/flask_postgresql_audit/core.py

@@ -103,6 +103,8 @@ class PostgreSQLAudit:
     pg_audit_enabled: bool
     pg_audit_entities: OrderedSet[ReplaceableEntity]
 
+    options: dict[str, t.Any]
+
     def __init__(
         self,
         *,
@@ -110,6 +112,7 @@ class PostgreSQLAudit:
         actor_id_getter: t.Callable[[], t.Any] = _default_actor_id,
         client_address_getter: t.Callable[[], t.Any] = _default_client_addr,
         schema_name: t.Optional[str] = None,
+        **kw,
     ):
         self._actor_cls = actor_cls
         self.schema_name = schema_name
@@ -117,11 +120,15 @@ class PostgreSQLAudit:
         self.get_actor_id = actor_id_getter
         self.get_client_addr = client_address_getter
 
+        self.options = kw
+
     @property
     def context(self):
         ctx = dict(schema_name=self.schema_name or "public")
         ctx["schema_prefix"] = f"{ctx['schema_name']}."
         ctx["revoke_cmd"] = f"REVOKE ALL ON {ctx['schema_prefix']}activity FROM public;"
+        if "jsonb_subtract_verbose" in self.options:
+            ctx["jsonb_subtract_join_type"] = "FULL"
         return ctx
 
     @contextmanager

flask_postgresql_audit-1.0.3/flask_postgresql_audit/templates/jsonb_subtract.sql

@@ -0,0 +1,22 @@
+CREATE FUNCTION ${schema_prefix}jsonb_subtract(arg1 jsonb, arg2 jsonb) RETURNS jsonb AS $$
+SELECT
+    COALESCE(
+        json_object_agg(
+            KEY,
+            CASE WHEN new_type = 'object' AND old_type = 'object'
+                THEN ${schema_prefix}jsonb_subtract(new_value, old_value)
+            ELSE new_value END
+        ),
+        '{}'
+    )::jsonb
+FROM (
+        SELECT KEY, VALUE AS new_value, jsonb_typeof(VALUE) AS new_type
+        FROM jsonb_each(arg1::jsonb)
+    ) AS NEW
+    ${jsonb_subtract_join_type} OUTER JOIN (
+        SELECT KEY, VALUE AS old_value, jsonb_typeof(VALUE) AS old_type
+        FROM jsonb_each(arg2::jsonb)
+    ) AS OLD
+    USING (KEY)
+WHERE new_value IS DISTINCT FROM old_value
+$$ LANGUAGE SQL;

{flask_postgresql_audit-1.0.1 → flask_postgresql_audit-1.0.3}/pyproject.toml

@@ -8,7 +8,7 @@ readme = "README.md"
 license = "bsd-2-clause"
 requires-python = ">=3.11"
 authors = [
-    { name = "Refian Muhammad", email = "higamigu@gmail.com" },
+    { name = "Higamigu", email = "higamigu@gmail.com" },
     { name = "Konsta Vesterinen", email = "konsta@fastmonkeys.com" },
 ]
 classifiers = [

{flask_postgresql_audit-1.0.1 → flask_postgresql_audit-1.0.3}/tests/app.py

@@ -14,8 +14,11 @@ class DefaultConfig:
     DB_PASSWORD = os.environ.get("POSTGRESQL_AUDIT_TEST_PASSWORD", "")
     DB_NAME = os.environ.get("POSTGRESQL_AUDIT_TEST_DB", "postgresql_audit_test")
 
+    # SQLALCHEMY_DATABASE_URI = (
+    #     f"postgresql://{DB_USER}:{DB_PASSWORD}@localhost/{DB_NAME}"
+    # )
     SQLALCHEMY_DATABASE_URI = (
-        f"postgresql://{DB_USER}:{DB_PASSWORD}@localhost/{DB_NAME}"
+        "postgresql://postgres:postgres@localhost:5492/pg_audit_test"
     )
     SQLALCHEMY_ECHO = False
 

flask_postgresql_audit-1.0.1/flask_postgresql_audit/templates/jsonb_subtract.sql

@@ -1,5 +0,0 @@
-CREATE FUNCTION jsonb_subtract(arg1 jsonb, arg2 jsonb) RETURNS jsonb AS $$
-SELECT COALESCE(json_object_agg(key, value), '{}')::jsonb
-FROM jsonb_each(arg1)
-WHERE (arg1->key) <> (arg2->key)
-    OR (arg2->key) IS NULL $$ LANGUAGE SQL;