plain.models 0.43.0__tar.gz → 0.45.0__tar.gz

{plain_models-0.43.0 → plain_models-0.45.0}/.gitignore

@@ -11,8 +11,6 @@ plain*/tests/.plain
 # Ottobot
 .aider*
 
-/llms-full.txt
-
 # Plain temp dirs
 .plain
 

{plain_models-0.43.0 → plain_models-0.45.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.models
-Version: 0.43.0
+Version: 0.45.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 → plain_models-0.45.0}/plain/models/CHANGELOG.md

@@ -1,5 +1,26 @@
 # plain-models changelog
 
+## [0.45.0](https://github.com/dropseed/plain/releases/plain-models@0.45.0) (2025-09-21)
+
+### What's changed
+
+- Added unlimited varchar support to SQLite - CharField fields without a max_length now generate `varchar` columns instead of `varchar()` with no length specified ([c5c0c3a](https://github.com/dropseed/plain/commit/c5c0c3a743))
+
+### Upgrade instructions
+
+- No changes required
+
+## [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-0.43.0 → plain_models-0.45.0}/plain/models/backends/sqlite3/base.py

@@ -39,6 +39,12 @@ def adapt_datetime(val):
     return val.isoformat(" ")
 
 
+def _get_varchar_column(data):
+    if data["max_length"] is None:
+        return "varchar"
+    return "varchar({max_length})".format(**data)
+
+
 Database.register_converter("bool", b"1".__eq__)
 Database.register_converter("date", decoder(parse_date))
 Database.register_converter("time", decoder(parse_time))
@@ -60,7 +66,7 @@ class DatabaseWrapper(BaseDatabaseWrapper):
         "PrimaryKeyField": "integer",
         "BinaryField": "BLOB",
         "BooleanField": "bool",
-        "CharField": "varchar(%(max_length)s)",
+        "CharField": _get_varchar_column,
         "DateField": "date",
         "DateTimeField": "datetime",
         "DecimalField": "decimal",

{plain_models-0.43.0 → plain_models-0.45.0}/plain/models/backends/sqlite3/features.py

@@ -31,6 +31,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
     supports_json_field_contains = False
     supports_update_conflicts = Database.sqlite_version_info >= (3, 24, 0)
     supports_update_conflicts_with_target = supports_update_conflicts
+    supports_unlimited_charfield = True
 
     @cached_property
     def supports_atomic_references_rename(self):

{plain_models-0.43.0 → plain_models-0.45.0}/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-0.43.0 → plain_models-0.45.0}/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 → plain_models-0.45.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plain.models"
-version = "0.43.0"
+version = "0.45.0"
 description = "Model your data and store it in a database."
 authors = [{name = "Dave Gaeddert", email = "dave.gaeddert@dropseed.dev"}]
 readme = "README.md"