plain.models 0.43.0__py3-none-any.whl → 0.44.0__py3-none-any.whl

plain/models/CHANGELOG.md

@@ -1,5 +1,16 @@
 # plain-models changelog
 
+## [0.44.0](https://github.com/dropseed/plain/releases/plain-models@0.44.0) (2025-09-19)
+
+### What's changed
+
+- PostgreSQL backup restoration now drops and recreates the database instead of using `pg_restore --clean`, providing more reliable restoration by terminating active connections and ensuring a completely clean database state ([a8865fe](https://github.com/dropseed/plain/commit/a8865fe5d6))
+- Added `_meta` type annotation to the `Model` class for improved type checking and IDE support ([387b92e](https://github.com/dropseed/plain/commit/387b92e08b))
+
+### Upgrade instructions
+
+- No changes required
+
 ## [0.43.0](https://github.com/dropseed/plain/releases/plain-models@0.43.0) (2025-09-12)
 
 ### What's changed

plain/models/backups/clients.py

@@ -64,29 +64,47 @@ class PostgresBackupClient:
             cmd, env={**os.environ, **self.get_env()}, check=True, shell=True
         )
 
-    def restore_backup(self, backup_path, *, pg_restore="pg_restore"):
+    def restore_backup(self, backup_path, *, pg_restore="pg_restore", psql="psql"):
         settings_dict = self.connection.settings_dict
 
-        args = pg_restore.split()
-        options = settings_dict.get("OPTIONS", {})
-
         host = settings_dict.get("HOST")
         port = settings_dict.get("PORT")
         dbname = settings_dict.get("NAME")
         user = settings_dict.get("USER")
-        service = options.get("service")
 
-        if not dbname and not service:
-            # Connect to the default 'postgres' db.
-            dbname = "postgres"
+        # Build common connection args
+        conn_args = []
         if user:
-            args += ["-U", user]
+            conn_args += ["-U", user]
         if host:
-            args += ["-h", host]
+            conn_args += ["-h", host]
         if port:
-            args += ["-p", str(port)]
-
-        args += ["--clean"]  # Drop existing tables
+            conn_args += ["-p", str(port)]
+
+        # First, drop and recreate the database
+        # Connect to 'template1' database to do this (works for all databases including 'postgres')
+        drop_create_cmds = [
+            f"SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = '{dbname}' AND pid <> pg_backend_pid()",
+            f'DROP DATABASE IF EXISTS "{dbname}"',
+            f'CREATE DATABASE "{dbname}"',
+        ]
+
+        for cmd in drop_create_cmds:
+            psql_args = (
+                psql.split()
+                + conn_args
+                + [
+                    "-d",
+                    "template1",  # Always use template1
+                    "-c",
+                    cmd,
+                ]
+            )
+            subprocess.run(psql_args, env={**os.environ, **self.get_env()}, check=True)
+
+        # Now restore into the fresh database
+        args = pg_restore.split()
+        args += conn_args
         args += ["-d", dbname]
 
         # Using stdin/stdout let's us use executables from within a docker container too

plain/models/base.py

@@ -193,6 +193,7 @@ class ModelState:
 
 
 class Model(metaclass=ModelBase):
+    _meta: Options
     DoesNotExist: type[ObjectDoesNotExist]
     MultipleObjectsReturned: type[MultipleObjectsReturned]
 

{plain_models-0.43.0.dist-info → plain_models-0.44.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.models
-Version: 0.43.0
+Version: 0.44.0
 Summary: Model your data and store it in a database.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-File: LICENSE

{plain_models-0.43.0.dist-info → plain_models-0.44.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
 plain/models/AGENTS.md,sha256=xQQW-z-DehnCUyjiGSBfLqUjoSUdo_W1b0JmwYmWieA,209
-plain/models/CHANGELOG.md,sha256=yPHtgiBY7hwtydus3mAiT945vgMTO5c9pF64KC9V37s,14530
+plain/models/CHANGELOG.md,sha256=xfDewS2Wt9gfbvC2fvpcZmQlaWAQCQ-YZ6aGLc69eHA,15141
 plain/models/README.md,sha256=lqzWJrEIxBCHC1P8X1YoRjbsMFlu0-kG4ujP76B_ZO4,8572
 plain/models/__init__.py,sha256=aB9HhIKBh0iK3LZztInAE-rDF-yKsdfcjfMtwtN5vnI,2920
 plain/models/aggregates.py,sha256=P0mhsMl1VZt2CVHMuCHnNI8SxZ9citjDLEgioN6NOpo,7240
-plain/models/base.py,sha256=Yp08EC4I0wQ65AXGNUe3mgM01zmuJ6B6XfFyCkcsmEc,66161
+plain/models/base.py,sha256=APZ1K8hbiznIdW6GvzPC6o1LhofX-ggOPuMPcwZtqME,66180
 plain/models/cli.py,sha256=lhvlw7DVOU3CVoMUpHaj7qIbQ2d6qtSm_l9PdCeCnc0,36404
 plain/models/config.py,sha256=OF7eIEtXNZyGwgc3eMEpb5uEAup5RXeT-0um60dfBeU,636
 plain/models/connections.py,sha256=RBNa2FZ0x3C9un6PaYL-IYzH_OesRSpdHNGKvYHGiOM,2276
@@ -69,7 +69,7 @@ plain/models/backends/sqlite3/operations.py,sha256=K2PFCsvzGhBrPEzz1AXFenge2B4Ap
 plain/models/backends/sqlite3/schema.py,sha256=sbtI0PBGe0fK0IOFWh0bkpVntCMMVsfzPb9dpL7o4r8,22566
 plain/models/backups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 plain/models/backups/cli.py,sha256=AKVh_Go0LxnxFi2jQjmpPEbbJvYCurjJsGCWESm1X8A,2960
-plain/models/backups/clients.py,sha256=WQ4X4KrkNeiKYJcpGRwnfRiAeeyduHWEnq4tA4mtjvw,4047
+plain/models/backups/clients.py,sha256=gHYQkukqamR_uksMr9wy3tBpMxK6DyUyj7nndNIlbo8,4744
 plain/models/backups/core.py,sha256=09IZUhBEe1Yej3PC8AidtkaI0c8tt7VnqGBCWK-WrFg,3318
 plain/models/fields/__init__.py,sha256=HrGTFOeG8Bt5pHWmiClmdn1qZcvCOIcXx4a5RKiIdr4,77938
 plain/models/fields/json.py,sha256=OdGW4EYBSHQgkuugB-EiIXOqGstUqcMKUvOTOVUHqEQ,18049
@@ -115,8 +115,8 @@ plain/models/sql/where.py,sha256=ezE9Clt2BmKo-I7ARsgqZ_aVA-1UdayCwr6ULSWZL6c,126
 plain/models/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 plain/models/test/pytest.py,sha256=KD5-mxonBxOYIhUh9Ql5uJOIiC9R4t-LYfb6sjA0UdE,3486
 plain/models/test/utils.py,sha256=S3d6zf3OFWDxB_kBJr0tDvwn51bjwDVWKPumv37N-p8,467
-plain_models-0.43.0.dist-info/METADATA,sha256=1lUO79n5x4G0s1FzZinEIm5izVs3R-ii1NOR8ecaHvA,8884
-plain_models-0.43.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain_models-0.43.0.dist-info/entry_points.txt,sha256=IYJAW9MpL3PXyXFWmKmALagAGXC_5rzBn2eEGJlcV04,112
-plain_models-0.43.0.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
-plain_models-0.43.0.dist-info/RECORD,,
+plain_models-0.44.0.dist-info/METADATA,sha256=fzAPXuVnxvkoidy4MOMhKc4zDCrLW-Fl7uOzwKIJCbk,8884
+plain_models-0.44.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain_models-0.44.0.dist-info/entry_points.txt,sha256=IYJAW9MpL3PXyXFWmKmALagAGXC_5rzBn2eEGJlcV04,112
+plain_models-0.44.0.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
+plain_models-0.44.0.dist-info/RECORD,,