Merge pull request #134 from OurFreeLight/dev

0.8.101 merge

builder/docker/docker-compose.gen.yaml

@@ -47,7 +47,7 @@ services:
     networks:
       - ${HOTSITE_NAME}-network
     healthcheck:
-      test: ["CMD", "mysqladmin" ,"ping", "-h", "127.0.0.1"]
+      test: ["CMD", "mariadb-admin" ,"ping", "-h", "127.0.0.1"]
       retries: 10
       timeout: 10s
     volumes:

builder/helm-chart/templates/database-statefulset.yaml

@@ -41,7 +41,7 @@ spec:
           livenessProbe:
             exec:
               command:
-                - mysqladmin
+                - mariadb-admin
                 - ping
                 - -h
                 - localhost
@@ -53,7 +53,7 @@ spec:
           readinessProbe:
             exec:
               command:
-                - mysqladmin
+                - mariadb-admin
                 - ping
                 - -h
                 - localhost

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hotstaq",
-  "version": "0.8.100",
+  "version": "0.8.101",
   "description": "A friendly web framework that fits nicely into devops and CI/CD pipelines.",
   "bin": {
     "hotstaq": "./bin/hotstaq"

src/HotCLI.ts

@@ -28,6 +28,7 @@ import { HotRoute } from "./HotRoute";
 import { HotRouteMethod } from "./HotRouteMethod";
 import { HotServerType } from "./HotServer";
 import { HotDeployer } from "./HotDeployer";
+import { HotDBType } from "./HotDB";
 
 HotStaq.isWeb = false;
 
@@ -202,7 +203,7 @@ export class HotCLI
 		{
 			let dbClass = null;
 
-			if (dbinfo.type === "mysql")
+			if ((dbinfo.type === "mysql") || (dbinfo.type === "mariadb"))
 				dbClass = HotDBMySQL;
 
 			if (dbinfo.type === "influx")
@@ -211,7 +212,14 @@ export class HotCLI
 			if (dbinfo.type === "postgres")
 				dbClass = HotDBPostgres;
 
+			if (dbClass == null)
+				throw new Error (`Unable to use database type ${dbinfo.type}, no class available.`);
+
 			api.db = new dbClass ();
+
+			if (dbinfo.type === "mariadb")
+				api.db.type = HotDBType.MariaDB;
+
 			await server.setAPI (api);
 
 			if (dbinfo.username === "")

src/HotStaq.ts

@@ -132,7 +132,7 @@ export class HotStaq implements IHotStaq
 	/**
 	 * The current version of HotStaq.
 	 */
-	static version: string = "0.8.100";
+	static version: string = "0.8.101";
 	/**
 	 * Indicates if this is a web build.
 	 */