Merge pull request 'fixes' (#18) from dev into main

Reviewed-on: #18

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "dblang",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "dblang",
-      "version": "0.9.0",
+      "version": "0.9.2",
       "license": "UNLICENSED",
       "dependencies": {
         "mariadb": "^3.0.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dblang",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "",
   "main": "dist/db.js",
   "types": "dist/db.d.ts",

src/dbStructure.ts

@@ -132,10 +132,12 @@ export class uniqueConstraint implements Constraint {
         this.attrs = attrs;
     }
     check(table: Table): boolean | string {
+        let prim = true;
         for (let i = 0; i < this.attrs.length; i++) {
-            if (this.attrs[i].ops.primaryKey) return "Can not combine unique Constraint and primary key";
+            if (!this.attrs[i].ops.primaryKey) prim = false;
             if (this.attrs[i].table != table) return "Referencing Attributes must be in host Table.";
         }
+        if (prim) return "Can not combine unique Constraint and primary key";
         return false;
     }
     uses(attr: Attribute): boolean {

src/defaultHandler.ts

@@ -604,6 +604,13 @@ export class Handler {
         },
     }
 
+    catcherrors = {
+        insert: (err: any) => {
+            if(err?.code == "ER_DUP_ENTRY") return {affectedRows: 0, insertId: -1};
+            throw err;
+        }
+    }
+
     responses = {
         readResponse: (resp: any) => new readResponse(resp),
         writeResponse: (resp: any) => new writeResponse(resp.affectedRows),

src/query.ts

@@ -138,8 +138,13 @@ export class insertQuery {
         const handler = db.getHandler();
         const builder = this.serialize(handler);
         const s = handler.builders.query(builder);
-        let readResp = await db.query(s, printQuery);
-        return db.getHandler().responses.insertResponse(readResp);
+        let readResp: any;
+        try {
+            readResp = await db.query(s, printQuery);
+        } catch (err) {
+            readResp = handler.catcherrors.insert(err);
+        }
+        return handler.responses.insertResponse(readResp);
     }
 }
 
@@ -168,7 +173,7 @@ export class updateQuery {
         const builder = this.serialize(handler);
         const s = handler.builders.query(builder);
         let readResp = await db.query(s, printQuery);
-        return db.getHandler().responses.writeResponse(readResp);
+        return handler.responses.writeResponse(readResp);
     }
 }
 
@@ -190,6 +195,6 @@ export class removeQuery {
         const builder = this.serialize(handler);
         const s = handler.builders.query(builder);
         let readResp = await db.query(s, printQuery);
-        return db.getHandler().responses.writeResponse(readResp);
+        return handler.responses.writeResponse(readResp);
     }
 }