Map MySQL tinyint(1) into boolean. Fixes #149

rmp135 · Nov 22, 2024 · 6bf60a2 · 6bf60a2
1 parent 835c13b
commit 6bf60a2
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 4 deletions.
diff --git a/src/Adapters/mysql.ts b/src/Adapters/mysql.ts
@@ -45,7 +45,7 @@ async function getAllColumns(db: Knex, config: Config, table: string, schema: st
     .map((c: MySQLColumn) => (
       {
         name: c.name,
-        type: c.type,
+        type: c.fullType == 'tinyint(1)' ? c.fullType : c.type, // tinyint(1) typically aliased as a boolean
         nullable: c.isNullable == 'YES',
         optional: c.isOptional === 1 || c.isNullable == 'YES',
         columnType: c.type == 'enum' ? 'StringEnum' : 'Standard',

diff --git a/src/TypeMap.ts b/src/TypeMap.ts
@@ -13,6 +13,7 @@ export default {
     'string[]' : ['_char', '_varchar', '_bpchar', '_character_data']
   },
   mssql: {
-    string: ['timestamp']
+    string: ['timestamp'],
+    boolean: ['tinyint(1)']
   }
 }
diff --git a/src/specs/Adapters/mysql.spec.ts b/src/specs/Adapters/mysql.spec.ts
@@ -20,7 +20,7 @@ beforeAll(async () => {
   sqlContainer = await new MySqlContainer().start()
 
   // Requires root user to create databases which act as schemas for our purposes
-  const connectionString = sqlContainer.getConnectionUri().replace('test:', 'root:')
+  const connectionString = sqlContainer.getConnectionUri().replace('test:', 'root:')  + "?tinyInt1isBit=true"
   const connectionDetails = new URL(connectionString)
 
   const config = {
@@ -45,6 +45,9 @@ beforeAll(async () => {
     CREATE TABLE schema_one.table_one (
       id INT PRIMARY KEY AUTO_INCREMENT COMMENT 'schema_one.id comment',
       name VARCHAR(255),
+      bool BOOLEAN,
+      smallNumber tinyint(3),
+      boolNumber tinyint(1),
       enum_column ENUM('enum_one', 'enum_two')
     ) COMMENT 'schema_one.table_one comment';
   `);
@@ -99,7 +102,7 @@ describe('getAllColumns', () => {
     }
     const columns = await mysql.getAllColumns(db, config, 'table_one', 'schema_one')
 
-    expect(columns.length).toEqual(3)
+    expect(columns.length).toEqual(6)
     expect(columns).toEqual<ColumnDefinition[]>([{
       name: 'id',
       type: 'int',
@@ -118,6 +121,33 @@ describe('getAllColumns', () => {
       columnType: 'Standard',
       isPrimaryKey: false,
       optional: true
+    }, {
+      name: 'bool',
+      type: 'tinyint(1)',
+      nullable: true,
+      defaultValue: null,
+      comment: '',
+      columnType: 'Standard',
+      isPrimaryKey: false,
+      optional: true
+    }, {
+      name: 'smallNumber',
+      type: 'tinyint',
+      nullable: true,
+      defaultValue: null,
+      comment: '',
+      columnType: 'Standard',
+      isPrimaryKey: false,
+      optional: true
+    }, {
+      name: 'boolNumber',
+      type: 'tinyint(1)',
+      nullable: true,
+      defaultValue: null,
+      comment: '',
+      columnType: 'Standard',
+      isPrimaryKey: false,
+      optional: true
     }, {
       name: 'enum_column',
       type: 'enum',