@oino-ts/db-mariadb 1.1.0 → 1.1.2

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}';`;
@@ -443,6 +437,24 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`;
         }
         return fields;
     }
+    /**
+     * Get the names of all user (base) tables in the database schema, excluding system tables and views.
+     *
+     */
+    async getSchemaTables() {
+        const tables = [];
+        const sql = "SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = '" + this.dbParams.database + "' AND TABLE_TYPE = 'BASE TABLE' ORDER BY TABLE_NAME;";
+        const tables_res = await this._query(sql);
+        while (!tables_res.isEof()) {
+            const row = tables_res.getRow();
+            const table_name = row[0]?.toString() || "";
+            if (table_name) {
+                tables.push(table_name);
+            }
+            await tables_res.next();
+        }
+        return tables;
+    }
     /**
      * Resolve the optimal native (SQL) type for a serialized field schema.
      *

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}';`;
@@ -440,6 +434,24 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`;
         }
         return fields;
     }
+    /**
+     * Get the names of all user (base) tables in the database schema, excluding system tables and views.
+     *
+     */
+    async getSchemaTables() {
+        const tables = [];
+        const sql = "SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = '" + this.dbParams.database + "' AND TABLE_TYPE = 'BASE TABLE' ORDER BY TABLE_NAME;";
+        const tables_res = await this._query(sql);
+        while (!tables_res.isEof()) {
+            const row = tables_res.getRow();
+            const table_name = row[0]?.toString() || "";
+            if (table_name) {
+                tables.push(table_name);
+            }
+            await tables_res.next();
+        }
+        return tables;
+    }
     /**
      * Resolve the optimal native (SQL) type for a serialized field schema.
      *

package/dist/types/OINODbMariadb.d.ts

@@ -95,6 +95,11 @@ export declare class OINODbMariadb extends OINODb {
      *
      */
     getSchemaFields(tableName: string): Promise<OINODataField[]>;
+    /**
+     * Get the names of all user (base) tables in the database schema, excluding system tables and views.
+     *
+     */
+    getSchemaTables(): Promise<string[]>;
     /**
      * Resolve the optimal native (SQL) type for a serialized field schema.
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db-mariadb",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "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.0",
-    "@oino-ts/db": "^1.1.0",
+    "@oino-ts/common": "^1.1.2",
+    "@oino-ts/db": "^1.1.2",
     "mariadb": "^3.2.3"
   },
   "devDependencies": {
-    "@types/bun": "^1.1.14",
+    "@types/bun": "^1.1.24",
     "@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}';`
@@ -464,6 +458,25 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`
         return fields
     }
 
+    /**
+     * Get the names of all user (base) tables in the database schema, excluding system tables and views.
+     *
+     */
+    async getSchemaTables(): Promise<string[]> {
+        const tables:string[] = []
+        const sql:string = "SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = '" + this.dbParams.database + "' AND TABLE_TYPE = 'BASE TABLE' ORDER BY TABLE_NAME;"
+        const tables_res:OINODataSet = await this._query(sql)
+        while (!tables_res.isEof()) {
+            const row:OINODataRow = tables_res.getRow()
+            const table_name:string = row[0]?.toString() || ""
+            if (table_name) {
+                tables.push(table_name)
+            }
+            await tables_res.next()
+        }
+        return tables
+    }
+
     /**
      * Resolve the optimal native (SQL) type for a serialized field schema.
      *