@oino-ts/db-mariadb 1.1.1 → 1.1.3

package/dist/cjs/OINODbMariadb.js

@@ -307,13 +307,7 @@ class OINODbMariadb extends db_1.OINODb {
             const sql = this._getValidateSql(this.dbParams.database);
             const sql_res = await this._query(sql);
             if (sql_res.isEmpty()) {
-                result.setError(400, "DB returned no rows for select!", "OINODbMariadb.validate");
-            }
-            else if (sql_res.getRow().length == 0) {
-                result.setError(400, "DB returned no values for database!", "OINODbMariadb.validate");
-            }
-            else if (sql_res.getRow()[0] == "0") {
-                result.setError(400, "DB returned no schema for database!", "OINODbMariadb.validate");
+                result.setError(400, "DB returned no rows for schema!", "OINODbMariadb.validate");
             }
             else {
                 this.isValidated = true;
@@ -369,12 +363,12 @@ class OINODbMariadb extends db_1.OINODb {
     }
     _getSchemaSql(dbName, tableName) {
         const sql = `SELECT
-    c.COLUMN_NAME,
-    c.COLUMN_TYPE,
-    c.IS_NULLABLE,
-    c.COLUMN_KEY,
-    c.COLUMN_DEFAULT,
-    c.EXTRA,
+    C.COLUMN_NAME,
+    C.COLUMN_TYPE,
+    C.IS_NULLABLE,
+    C.COLUMN_KEY,
+    C.COLUMN_DEFAULT,
+    C.EXTRA,
     KCU.CONSTRAINT_NAME AS ForeignKeyName 
 FROM information_schema.COLUMNS C
 	LEFT JOIN information_schema.KEY_COLUMN_USAGE KCU ON KCU.TABLE_SCHEMA = C.TABLE_SCHEMA AND KCU.TABLE_NAME = C.TABLE_NAME AND C.COLUMN_NAME = KCU.COLUMN_NAME and KCU.REFERENCED_TABLE_NAME IS NOT NULL
@@ -384,7 +378,7 @@ ORDER BY C.ORDINAL_POSITION;`;
     }
     _getValidateSql(dbName) {
         const sql = `SELECT
-    Count(c.COLUMN_NAME) AS COLUMN_COUNT
+    Count(C.COLUMN_NAME) AS COLUMN_COUNT
 FROM information_schema.COLUMNS C
 	LEFT JOIN information_schema.KEY_COLUMN_USAGE KCU ON KCU.TABLE_SCHEMA = C.TABLE_SCHEMA AND KCU.TABLE_NAME = C.TABLE_NAME AND C.COLUMN_NAME = KCU.COLUMN_NAME and KCU.REFERENCED_TABLE_NAME IS NOT NULL
 WHERE C.TABLE_SCHEMA = '${dbName}';`;
@@ -413,7 +407,7 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`;
                 isAutoInc: extra.indexOf('auto_increment') >= 0,
                 isNotNull: row[2] == "NO"
             };
-            if ((sql_type == "int") || (sql_type == "smallint") || (sql_type == "float") || (sql_type == "double")) {
+            if ((sql_type == "int") || (sql_type == "smallint") || (sql_type == "mediumint") || (sql_type == "bigint") || (sql_type == "float") || (sql_type == "double")) {
                 fields.push(new common_2.OINONumberDataField(this, field_name, sql_type, field_params));
             }
             else if ((sql_type == "date") || (sql_type == "datetime") || (sql_type == "timestamp")) {
@@ -472,7 +466,7 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`;
             case "string":
                 return (schema.maxLength || 0) > 0 ? "varchar(" + schema.maxLength + ")" : "longtext";
             case "number":
-                return "double";
+                return schema.fieldParams?.isAutoInc ? "bigint" : "double";
             case "boolean":
                 return "bit(1)";
             case "datetime":
@@ -483,5 +477,8 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`;
                 throw new Error(common_1.OINO_ERROR_PREFIX + ": OINODbMariadb.getNativeDataType - unsupported field type '" + schema.type + "'");
         }
     }
+    _printColumnAutoInc() {
+        return "AUTO_INCREMENT";
+    }
 }
 exports.OINODbMariadb = OINODbMariadb;

package/dist/esm/OINODbMariadb.js

@@ -304,13 +304,7 @@ export class OINODbMariadb extends OINODb {
             const sql = this._getValidateSql(this.dbParams.database);
             const sql_res = await this._query(sql);
             if (sql_res.isEmpty()) {
-                result.setError(400, "DB returned no rows for select!", "OINODbMariadb.validate");
-            }
-            else if (sql_res.getRow().length == 0) {
-                result.setError(400, "DB returned no values for database!", "OINODbMariadb.validate");
-            }
-            else if (sql_res.getRow()[0] == "0") {
-                result.setError(400, "DB returned no schema for database!", "OINODbMariadb.validate");
+                result.setError(400, "DB returned no rows for schema!", "OINODbMariadb.validate");
             }
             else {
                 this.isValidated = true;
@@ -366,12 +360,12 @@ export class OINODbMariadb extends OINODb {
     }
     _getSchemaSql(dbName, tableName) {
         const sql = `SELECT
-    c.COLUMN_NAME,
-    c.COLUMN_TYPE,
-    c.IS_NULLABLE,
-    c.COLUMN_KEY,
-    c.COLUMN_DEFAULT,
-    c.EXTRA,
+    C.COLUMN_NAME,
+    C.COLUMN_TYPE,
+    C.IS_NULLABLE,
+    C.COLUMN_KEY,
+    C.COLUMN_DEFAULT,
+    C.EXTRA,
     KCU.CONSTRAINT_NAME AS ForeignKeyName 
 FROM information_schema.COLUMNS C
 	LEFT JOIN information_schema.KEY_COLUMN_USAGE KCU ON KCU.TABLE_SCHEMA = C.TABLE_SCHEMA AND KCU.TABLE_NAME = C.TABLE_NAME AND C.COLUMN_NAME = KCU.COLUMN_NAME and KCU.REFERENCED_TABLE_NAME IS NOT NULL
@@ -381,7 +375,7 @@ ORDER BY C.ORDINAL_POSITION;`;
     }
     _getValidateSql(dbName) {
         const sql = `SELECT
-    Count(c.COLUMN_NAME) AS COLUMN_COUNT
+    Count(C.COLUMN_NAME) AS COLUMN_COUNT
 FROM information_schema.COLUMNS C
 	LEFT JOIN information_schema.KEY_COLUMN_USAGE KCU ON KCU.TABLE_SCHEMA = C.TABLE_SCHEMA AND KCU.TABLE_NAME = C.TABLE_NAME AND C.COLUMN_NAME = KCU.COLUMN_NAME and KCU.REFERENCED_TABLE_NAME IS NOT NULL
 WHERE C.TABLE_SCHEMA = '${dbName}';`;
@@ -410,7 +404,7 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`;
                 isAutoInc: extra.indexOf('auto_increment') >= 0,
                 isNotNull: row[2] == "NO"
             };
-            if ((sql_type == "int") || (sql_type == "smallint") || (sql_type == "float") || (sql_type == "double")) {
+            if ((sql_type == "int") || (sql_type == "smallint") || (sql_type == "mediumint") || (sql_type == "bigint") || (sql_type == "float") || (sql_type == "double")) {
                 fields.push(new OINONumberDataField(this, field_name, sql_type, field_params));
             }
             else if ((sql_type == "date") || (sql_type == "datetime") || (sql_type == "timestamp")) {
@@ -469,7 +463,7 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`;
             case "string":
                 return (schema.maxLength || 0) > 0 ? "varchar(" + schema.maxLength + ")" : "longtext";
             case "number":
-                return "double";
+                return schema.fieldParams?.isAutoInc ? "bigint" : "double";
             case "boolean":
                 return "bit(1)";
             case "datetime":
@@ -480,4 +474,7 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`;
                 throw new Error(OINO_ERROR_PREFIX + ": OINODbMariadb.getNativeDataType - unsupported field type '" + schema.type + "'");
         }
     }
+    _printColumnAutoInc() {
+        return "AUTO_INCREMENT";
+    }
 }

package/dist/types/OINODbMariadb.d.ts

@@ -107,4 +107,5 @@ export declare class OINODbMariadb extends OINODb {
      *
      */
     getNativeDataType(schema: OINODataFieldSchema): string;
+    protected _printColumnAutoInc(): string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db-mariadb",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "OINO TS package for using Mariadb databases.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -21,12 +21,12 @@
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "dependencies": {
-    "@oino-ts/common": "^1.1.1",
-    "@oino-ts/db": "^1.1.1",
+    "@oino-ts/common": "^1.1.3",
+    "@oino-ts/db": "^1.1.3",
     "mariadb": "^3.2.3"
   },
   "devDependencies": {
-    "@types/bun": "^1.1.14",
+    "@types/bun": "^1.1.34",
     "@types/node": "^20.12.7",
     "typescript": "~5.9.0"
   },

package/src/OINODbMariadb.ts

@@ -326,13 +326,7 @@ export class OINODbMariadb extends OINODb {
             const sql = this._getValidateSql(this.dbParams.database)
             const sql_res:OINODataSet = await this._query(sql)
             if (sql_res.isEmpty()) {
-                result.setError(400, "DB returned no rows for select!", "OINODbMariadb.validate")
-
-            } else if (sql_res.getRow().length == 0) {
-                result.setError(400, "DB returned no values for database!", "OINODbMariadb.validate")
-
-            } else if (sql_res.getRow()[0] == "0") {
-                result.setError(400, "DB returned no schema for database!", "OINODbMariadb.validate")
+                result.setError(400, "DB returned no rows for schema!", "OINODbMariadb.validate")
 
             } else {
                 this.isValidated = true
@@ -392,12 +386,12 @@ export class OINODbMariadb extends OINODb {
     private _getSchemaSql(dbName:string, tableName:string):string {
         const sql = 
 `SELECT
-    c.COLUMN_NAME,
-    c.COLUMN_TYPE,
-    c.IS_NULLABLE,
-    c.COLUMN_KEY,
-    c.COLUMN_DEFAULT,
-    c.EXTRA,
+    C.COLUMN_NAME,
+    C.COLUMN_TYPE,
+    C.IS_NULLABLE,
+    C.COLUMN_KEY,
+    C.COLUMN_DEFAULT,
+    C.EXTRA,
     KCU.CONSTRAINT_NAME AS ForeignKeyName 
 FROM information_schema.COLUMNS C
 	LEFT JOIN information_schema.KEY_COLUMN_USAGE KCU ON KCU.TABLE_SCHEMA = C.TABLE_SCHEMA AND KCU.TABLE_NAME = C.TABLE_NAME AND C.COLUMN_NAME = KCU.COLUMN_NAME and KCU.REFERENCED_TABLE_NAME IS NOT NULL
@@ -409,7 +403,7 @@ ORDER BY C.ORDINAL_POSITION;`
     private _getValidateSql(dbName:string):string {
         const sql = 
 `SELECT
-    Count(c.COLUMN_NAME) AS COLUMN_COUNT
+    Count(C.COLUMN_NAME) AS COLUMN_COUNT
 FROM information_schema.COLUMNS C
 	LEFT JOIN information_schema.KEY_COLUMN_USAGE KCU ON KCU.TABLE_SCHEMA = C.TABLE_SCHEMA AND KCU.TABLE_NAME = C.TABLE_NAME AND C.COLUMN_NAME = KCU.COLUMN_NAME and KCU.REFERENCED_TABLE_NAME IS NOT NULL
 WHERE C.TABLE_SCHEMA = '${dbName}';`
@@ -440,7 +434,7 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`
                 isAutoInc: extra.indexOf('auto_increment') >= 0,
                 isNotNull: row[2] == "NO"
             }
-            if ((sql_type == "int") || (sql_type == "smallint") || (sql_type == "float") || (sql_type == "double")) {
+            if ((sql_type == "int") || (sql_type == "smallint")  || (sql_type == "mediumint") || (sql_type == "bigint")  || (sql_type == "float") || (sql_type == "double")) {
                 fields.push(new OINONumberDataField(this, field_name, sql_type, field_params))
             } else if ((sql_type == "date") || (sql_type == "datetime") || (sql_type == "timestamp")) {
                 fields.push(new OINODatetimeDataField(this, field_name, sql_type, field_params))
@@ -494,7 +488,7 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`
             case "string":
                 return (schema.maxLength || 0) > 0 ? "varchar(" + schema.maxLength + ")" : "longtext"
             case "number":
-                return "double"
+                return schema.fieldParams?.isAutoInc ? "bigint" : "double"
             case "boolean":
                 return "bit(1)"
             case "datetime":
@@ -505,6 +499,10 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`
                 throw new Error(OINO_ERROR_PREFIX + ": OINODbMariadb.getNativeDataType - unsupported field type '" + schema.type + "'")
         }
     }
+
+    protected _printColumnAutoInc(): string {
+        return "AUTO_INCREMENT"
+    }
 }