piccolo 1.23.0__tar.gz → 1.24.0__tar.gz

{piccolo-1.23.0 → piccolo-1.24.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: piccolo
-Version: 1.23.0
+Version: 1.24.0
 Summary: A fast, user friendly ORM and query builder which supports asyncio.
 Home-page: https://github.com/piccolo-orm/piccolo
 Author: Daniel Townsend

piccolo-1.24.0/piccolo/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "1.24.0"

{piccolo-1.23.0 → piccolo-1.24.0}/piccolo/apps/sql_shell/commands/run.py

@@ -28,24 +28,23 @@ def run() -> None:
 
         args = ["psql"]
 
-        host = engine.config.get("host")
-        port = engine.config.get("port")
-        user = engine.config.get("user")
-        password = engine.config.get("password")
-        database = engine.config.get("database")
+        config = engine.config
 
-        if user:
-            args += ["-U", user]
-        if host:
-            args += ["-h", host]
-        if port:
-            args += ["-p", str(port)]
-        if database:
-            args += [database]
+        if dsn := config.get("dsn"):
+            args += [dsn]
+        else:
+            if user := config.get("user"):
+                args += ["-U", user]
+            if host := config.get("host"):
+                args += ["-h", host]
+            if port := config.get("port"):
+                args += ["-p", str(port)]
+            if database := config.get("database"):
+                args += [database]
 
         sigint_handler = signal.getsignal(signal.SIGINT)
         subprocess_env = os.environ.copy()
-        if password:
+        if password := config.get("password"):
             subprocess_env["PGPASSWORD"] = str(password)
         try:
             # Allow SIGINT to pass to psql to abort queries.

{piccolo-1.23.0 → piccolo-1.24.0}/piccolo/apps/user/tables.py

@@ -202,7 +202,9 @@ class BaseUser(Table, tablename="piccolo_user"):
             The id of the user if a match is found, otherwise ``None``.
 
         """
-        if len(username) > cls.username.length:
+        if (max_username_length := cls.username.length) and len(
+            username
+        ) > max_username_length:
             logger.warning("Excessively long username provided.")
             return None
 

{piccolo-1.23.0 → piccolo-1.24.0}/piccolo/columns/column_types.py

@@ -315,7 +315,7 @@ class Varchar(Column):
 
     def __init__(
         self,
-        length: int = 255,
+        length: t.Optional[int] = 255,
         default: t.Union[str, Enum, t.Callable[[], str], None] = "",
         **kwargs,
     ) -> None:

{piccolo-1.23.0 → piccolo-1.24.0}/piccolo/query/methods/objects.py

@@ -65,22 +65,20 @@ class GetOrCreate(
             instance._was_created = False
             return instance
 
-        instance = self.table_class(_data=self.defaults)
+        data = {**self.defaults}
 
         # If it's a complex `where`, there can be several column values to
         # extract e.g. (Band.name == 'Pythonistas') & (Band.popularity == 1000)
         if isinstance(self.where, Where):
-            setattr(
-                instance,
-                self.where.column._meta.name,  # type: ignore
-                self.where.value,  # type: ignore
-            )
+            data[self.where.column] = self.where.value
         elif isinstance(self.where, And):
             for column, value in self.where.get_column_values().items():
                 if len(column._meta.call_chain) == 0:
                     # Make sure we only set the value if the column belongs
                     # to this table.
-                    setattr(instance, column._meta.name, value)
+                    data[column] = value
+
+        instance = self.table_class(_data=data)
 
         await instance.save().run(node=node, in_pool=in_pool)
 

{piccolo-1.23.0 → piccolo-1.24.0}/piccolo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: piccolo
-Version: 1.23.0
+Version: 1.24.0
 Summary: A fast, user friendly ORM and query builder which supports asyncio.
 Home-page: https://github.com/piccolo-orm/piccolo
 Author: Daniel Townsend

piccolo-1.24.0/tests/apps/sql_shell/commands/test_run.py

@@ -0,0 +1,38 @@
+from unittest import TestCase
+from unittest.mock import MagicMock, patch
+
+from piccolo.apps.sql_shell.commands.run import run
+from tests.base import postgres_only, sqlite_only
+
+
+class TestRun(TestCase):
+    @postgres_only
+    @patch("piccolo.apps.sql_shell.commands.run.subprocess")
+    def test_psql(self, subprocess: MagicMock):
+        """
+        Make sure psql was called correctly.
+        """
+        run()
+        self.assertTrue(subprocess.run.called)
+
+        assert subprocess.run.call_args.args[0] == [
+            "psql",
+            "-U",
+            "postgres",
+            "-h",
+            "localhost",
+            "-p",
+            "5432",
+            "piccolo",
+        ]
+
+    @sqlite_only
+    @patch("piccolo.apps.sql_shell.commands.run.subprocess")
+    def test_sqlite3(self, subprocess: MagicMock):
+        """
+        Make sure sqlite3 was called correctly.
+        """
+        run()
+        self.assertTrue(subprocess.run.called)
+
+        assert subprocess.run.call_args.args[0] == ["sqlite3", "test.sqlite"]

{piccolo-1.23.0 → piccolo-1.24.0}/tests/table/test_objects.py

@@ -1,3 +1,5 @@
+from piccolo.columns.column_types import ForeignKey
+from piccolo.testing.test_case import AsyncTableTest
 from tests.base import DBTestCase, engines_only, sqlite_only
 from tests.example_apps.music.tables import Band, Manager
 
@@ -268,3 +270,32 @@ class TestGetOrCreate(DBTestCase):
         self.assertIsInstance(band.manager, Manager)
         self.assertEqual(band.name, "New Band 2")
         self.assertEqual(band.manager.name, "Guido")
+
+
+class BandNotNull(Band, tablename="band"):
+    manager = ForeignKey(Manager, null=False)
+
+
+class TestGetOrCreateNotNull(AsyncTableTest):
+
+    tables = [BandNotNull, Manager]
+
+    async def test_not_null(self):
+        """
+        There was a bug where `get_or_create` would fail for columns with
+        `default=None` and `null=False`, even if the value for those columns
+        was specified in the where clause.
+
+        https://github.com/piccolo-orm/piccolo/issues/1152
+
+        """
+
+        manager = Manager({Manager.name: "Test"})
+        await manager.save()
+
+        self.assertIsInstance(
+            await BandNotNull.objects().get_or_create(
+                BandNotNull.manager == manager
+            ),
+            BandNotNull,
+        )

piccolo-1.23.0/piccolo/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "1.23.0"

piccolo-1.23.0/tests/apps/sql_shell/commands/test_run.py

@@ -1,14 +0,0 @@
-from unittest import TestCase
-from unittest.mock import MagicMock, patch
-
-from piccolo.apps.sql_shell.commands.run import run
-
-
-class TestRun(TestCase):
-    @patch("piccolo.apps.sql_shell.commands.run.subprocess")
-    def test_run(self, subprocess: MagicMock):
-        """
-        A simple test to make sure it executes without raising any exceptions.
-        """
-        run()
-        self.assertTrue(subprocess.run.called)