Merge pull request piccolo-orm#34 from piccolo-orm/boolean_fixes

fixing bug with boolean column defaults

Author: dantownsend

piccolo/apps/playground/commands/run.py

@@ -9,6 +9,7 @@
 
 from piccolo.table import Table
 from piccolo.columns import (
+    Boolean,
     Varchar,
     ForeignKey,
     Integer,
@@ -51,6 +52,7 @@ class Ticket(Table):
 
 class DiscountCode(Table):
     code = UUID()
+    active = Boolean(default=True, null=True)
 
 
 TABLES = (Manager, Band, Venue, Concert, Ticket, DiscountCode)

piccolo/engine/sqlite.py

@@ -96,12 +96,21 @@ def convert_seconds_out(value: bytes) -> datetime.timedelta:
     return datetime.timedelta(seconds=float(value.decode("utf8")))
 
 
+def convert_boolean_out(value: bytes) -> bool:
+    """
+    If the value is from a boolean column, convert it to a bool value.
+    """
+    _value = value.decode("utf8")
+    return _value == "1"
+
+
 sqlite3.register_converter("Numeric", convert_numeric_out)
 sqlite3.register_converter("Integer", convert_int_out)
 sqlite3.register_converter("UUID", convert_uuid_out)
 sqlite3.register_converter("Date", convert_date_out)
 sqlite3.register_converter("Time", convert_time_out)
 sqlite3.register_converter("Seconds", convert_seconds_out)
+sqlite3.register_converter("Boolean", convert_boolean_out)
 
 sqlite3.register_adapter(Decimal, convert_numeric_in)
 sqlite3.register_adapter(uuid.UUID, convert_uuid_in)

piccolo/table.py

@@ -245,8 +245,8 @@ def __init__(self, ignore_missing: bool = False, **kwargs):
         Assigns any default column values to the class.
         """
         for column in self._meta.columns:
-            value = kwargs.pop(column._meta.name, None)
-            if not value:
+            value = kwargs.pop(column._meta.name, ...)
+            if value is ...:
                 value = column.get_default_value()
 
                 if isinstance(value, Default):

tests/columns/test_boolean.py

@@ -0,0 +1,33 @@
+from unittest import TestCase
+
+from piccolo.table import Table
+from piccolo.columns.column_types import Boolean
+
+
+class MyTable(Table):
+    boolean = Boolean(boolean=False, null=True)
+
+
+class TestBoolean(TestCase):
+    def setUp(self):
+        MyTable.create_table().run_sync()
+
+    def tearDown(self):
+        MyTable.alter().drop_table().run_sync()
+
+    def test_return_type(self):
+        for value in (True, False, None, ...):
+            kwargs = {} if value is ... else {"boolean": value}
+            expected = MyTable.boolean.default if value is ... else value
+
+            row = MyTable(**kwargs)
+            row.save().run_sync()
+            self.assertEqual(row.boolean, expected)
+
+            self.assertEqual(
+                MyTable.select(MyTable.boolean)
+                .where(MyTable.id == row.id)
+                .first()
+                .run_sync()["boolean"],
+                expected,
+            )