Merge pull request #56 from lsst/tickets/DM-43751

DM-43751: Change default type mapping for boolean to BOOLEAN for MySQL
lsst · Apr 18, 2024 · 00bf779 · 00bf779
2 parents 2c982cf + de6d5e8
commit 00bf779
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/python/felis/db/sqltypes.py b/python/felis/db/sqltypes.py
@@ -47,7 +47,7 @@ def compile_tinyint(type_: Any, compiler: Any, **kw: Any) -> str:
 
 _TypeMap = Mapping[str, types.TypeEngine | type[types.TypeEngine]]
 
-boolean_map: _TypeMap = {MYSQL: mysql.BIT(1), ORACLE: oracle.NUMBER(1), POSTGRES: postgresql.BOOLEAN()}
+boolean_map: _TypeMap = {MYSQL: mysql.BOOLEAN, ORACLE: oracle.NUMBER(1), POSTGRES: postgresql.BOOLEAN()}
 
 byte_map: _TypeMap = {
     MYSQL: mysql.TINYINT(),

diff --git a/tests/test_datatypes.py b/tests/test_datatypes.py
@@ -61,9 +61,6 @@ def test_mysql_datatypes(self) -> None:
         with self.assertRaises(ValidationError):
             coldata.col("int", "INTEGER")
 
-        with self.assertRaises(ValidationError):
-            coldata.col("boolean", "BIT(1)")
-
         with self.assertRaises(ValidationError):
             coldata.col("float", "FLOAT")
 
@@ -82,9 +79,8 @@ def test_mysql_datatypes(self) -> None:
         with self.assertRaises(ValidationError):
             coldata.col("long", "BIGINT")
 
-        # These look like they should be equivalent, but the default is
-        # actually ``BIT(1)`` for MySQL.
-        coldata.col("boolean", "BOOLEAN")
+        with self.assertRaises(ValidationError):
+            coldata.col("boolean", "BOOLEAN")
 
         with self.assertRaises(ValidationError):
             coldata.col("unicode", "NVARCHAR", length=32)
@@ -102,6 +98,9 @@ def test_mysql_datatypes(self) -> None:
             # Same type and length
             coldata.col("string", "VARCHAR(128)", length=128)
 
+        # Check the old type mapping for MySQL, which is now okay
+        coldata.col("boolean", "BIT(1)")
+
         # Different types, which is okay
         coldata.col("double", "FLOAT")