Fix BigInt in MariaDB connector #335

azimuttapp · Dec 3, 2024 · fef9df9 · fef9df9
1 parent 90f964a
commit fef9df9
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 17 deletions.
diff --git a/cli/package.json b/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "azimutt",
   "description": "Export database schema from relational or document databases. Import it to https://azimutt.app",
-  "version": "0.1.35",
+  "version": "0.1.36",
   "license": "MIT",
   "homepage": "https://azimutt.app",
   "keywords": [

diff --git a/cli/src/version.ts b/cli/src/version.ts
@@ -1 +1 @@
-export const version = '0.1.35' // FIXME: `process.env.npm_package_version` is not available :/
+export const version = '0.1.36' // FIXME: `process.env.npm_package_version` is not available :/
diff --git a/gateway/package-lock.json b/gateway/package-lock.json
diff --git a/gateway/package.json b/gateway/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@azimutt/gateway",
   "description": "A Gateway to proxy database access for Azimutt frontend",
-  "version": "0.1.22",
+  "version": "0.1.23",
   "license": "MIT",
   "homepage": "https://azimutt.app",
   "keywords": [
@@ -29,7 +29,7 @@
   "dependencies": {
     "@azimutt/connector-bigquery": "^0.1.2",
     "@azimutt/connector-couchbase": "^0.1.2",
-    "@azimutt/connector-mariadb": "^0.1.8",
+    "@azimutt/connector-mariadb": "^0.1.9",
     "@azimutt/connector-mongodb": "^0.1.4",
     "@azimutt/connector-mysql": "^0.1.5",
     "@azimutt/connector-oracle": "^0.1.3",

diff --git a/libs/connector-mariadb/package.json b/libs/connector-mariadb/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@azimutt/connector-mariadb",
   "description": "Connect to MariaDB, extract schema, run analysis and queries",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "license": "MIT",
   "homepage": "https://azimutt.app",
   "keywords": [],

diff --git a/libs/connector-mariadb/src/mariadb.ts b/libs/connector-mariadb/src/mariadb.ts
@@ -107,9 +107,9 @@ export type RawTable = {
     table_kind: 'BASE TABLE' | 'VIEW' | 'SYSTEM VIEW'
     table_engine: 'MEMORY' | 'MyISAM' | 'InnoDB' | null
     table_comment: string // default: '' and 'VIEW'
-    table_rows: number | null // null for views
-    table_size: number | null // null for views
-    index_size: number | null // null for views
+    table_rows: number | bigint | null // null for views
+    table_size: number | bigint | null // null for views
+    index_size: number | bigint | null // null for views
     row_size: number | null // null for views
     auto_increment_next: number | null
     table_options: string | null // ex: 'max_rows=2802'
@@ -156,9 +156,9 @@ function buildEntity(table: RawTable, columns: RawColumn[], primaryKeyColumns: R
         checks: checks.map(buildCheck).filter(isNotUndefined),
         doc: table.table_comment === 'VIEW' ? undefined : table.table_comment || undefined,
         stats: removeUndefined({
-            rows: table.table_rows || undefined,
-            size: table.table_size || undefined,
-            sizeIdx: table.index_size || undefined,
+            rows: asNumber(table.table_rows),
+            size: asNumber(table.table_size),
+            sizeIdx: asNumber(table.index_size),
             sizeToast: undefined,
             sizeToastIdx: undefined,
             scanSeq: undefined,
@@ -172,6 +172,8 @@ function buildEntity(table: RawTable, columns: RawColumn[], primaryKeyColumns: R
     })
 }
 
+const asNumber = (i: bigint | number | null): number | undefined => i !== null ? (typeof i === 'bigint' ? Number(i) : i) : undefined
+
 export type RawColumn = {
     table_schema: string
     table_name: string
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const version = '0.1.35' // FIXME: `process.env.npm_package_version` is not available :/
		export const version = '0.1.36' // FIXME: `process.env.npm_package_version` is not available :/