Retrieve charset for tables in MySQL

knex · May 24, 2023 · 718ddcc · 718ddcc
1 parent c50b30d
commit 718ddcc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/lib/dialects/mysql.ts b/lib/dialects/mysql.ts
@@ -11,6 +11,7 @@ type RawTable = {
   TABLE_COMMENT: string | null;
   ENGINE: string;
   TABLE_COLLATION: string;
+  TABLE_CHARSET: string;
 };
 
 type RawColumn = {
@@ -104,9 +105,15 @@ export default class MySQL implements SchemaInspector {
         'ENGINE',
         'TABLE_SCHEMA',
         'TABLE_COLLATION',
-        'TABLE_COMMENT'
+        'TABLE_COMMENT',
+        'CHARACTER_SET_NAME as TABLE_CHARSET'
       )
       .from('information_schema.tables')
+      .leftJoin(
+        'information_schema.collation_character_set_applicability',
+        'tables.table_collation',
+        'collation_character_set_applicability.collation_name'
+      )
       .where({
         table_schema: this.knex.client.database(),
         table_type: 'BASE TABLE',
@@ -122,6 +129,7 @@ export default class MySQL implements SchemaInspector {
         schema: rawTable.TABLE_SCHEMA,
         comment: rawTable.TABLE_COMMENT,
         collation: rawTable.TABLE_COLLATION,
+        charset: rawTable.TABLE_CHARSET,
         engine: rawTable.ENGINE,
       } as T extends string ? Table : Table[];
     }
@@ -134,6 +142,7 @@ export default class MySQL implements SchemaInspector {
         schema: rawTable.TABLE_SCHEMA,
         comment: rawTable.TABLE_COMMENT,
         collation: rawTable.TABLE_COLLATION,
+        charset: rawTable.TABLE_CHARSET,
         engine: rawTable.ENGINE,
       };
     }) as T extends string ? Table : Table[];

diff --git a/lib/types/table.ts b/lib/types/table.ts
@@ -7,6 +7,7 @@ export interface Table {
 
   // MySQL Only
   collation?: string;
+  charset?: string;
   engine?: string;
 
   // Postgres Only

diff --git a/test/mysql.spec.ts b/test/mysql.spec.ts
@@ -44,27 +44,31 @@ describe('mysql', () => {
           schema: 'test_db',
           comment: '',
           collation: 'latin1_swedish_ci',
+          charset: 'latin1',
           engine: 'InnoDB',
         },
         {
           name: 'teams',
           schema: 'test_db',
           comment: '',
           collation: 'latin1_swedish_ci',
+          charset: 'latin1',
           engine: 'InnoDB',
         },
         {
           name: 'users',
           schema: 'test_db',
           comment: '',
           collation: 'latin1_swedish_ci',
+          charset: 'latin1',
           engine: 'InnoDB',
         },
       ]);
     });
 
     it('returns information for specific table', async () => {
       expect(await inspector.tableInfo('teams')).to.deep.equal({
+        charset: 'latin1',
         collation: 'latin1_swedish_ci',
         comment: '',
         engine: 'InnoDB',