Merge pull request 'order by' (#23) from dev into main

Reviewed-on: #23

.gitignore

@@ -3,3 +3,4 @@ node_modules
 ltests
 sqlsave
 postgresHandler.ts
+.vscode

.npmignore

@@ -1,2 +1,3 @@
 test.ts
 ltests
+sqlsave

.woodpecker.yml

@@ -10,9 +10,13 @@ pipeline:
       - npm install git+https://jusax.de/git/jusax23/gitea-release.git
       - mkdir build
       - mkdir dblang
+      - mkdir dblang/dist
       - mkdir upload
       - npm run prepublish
-      - cp dist/* dblang
+      - cp dist/* dblang/dist
+      - cp package.json dblang
+      - cp package-lock.json dblang
+      - cp readme.md dblang
       - zip -r upload/DBlang.zip dblang/*
       - tar -czvf upload/DBlang.tar.gz dblang/*
       - npx gitea-release "https://jusax.de/git/api/v1/" "$${GITEA_TOKEN}" "$${CI_REPO}" "$${CI_COMMIT_BRANCH}" "$${CI_COMMIT_TAG}" "upload" "$${CI_COMMIT_MESSAGE}"

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "dblang",
-  "version": "1.0.0",
+  "version": "0.9.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "dblang",
-      "version": "1.0.0",
+      "version": "0.9.6",
       "license": "UNLICENSED",
       "dependencies": {
         "mariadb": "^3.0.2",
@@ -19,7 +19,7 @@
         "typescript": "^4.9.4"
       },
       "engines": {
-        "node": ">= 14"
+        "node": ">= 16"
       }
     },
     "node_modules/@esbuild/android-arm": {

package.json

@@ -1,15 +1,15 @@
 {
   "name": "dblang",
-  "version": "1.0.0",
+  "version": "0.9.6",
   "description": "",
   "main": "dist/db.js",
   "types": "dist/db.d.ts",
-  "type": "commonjs",
+  "type": "module",
   "directories": {
-    "dsit": "dist"
+    "dist": "dist"
   },
   "files": [
-    "dist"
+    "dist/*"
   ],
   "private": false,
   "scripts": {
@@ -22,7 +22,7 @@
     "pg": "^8.9.0"
   },
   "engines": {
-    "node": ">= 14"
+    "node": ">= 16"
   },
   "devDependencies": {
     "@types/node": "^18.11.18",

readme.md

@@ -13,6 +13,8 @@ Features:
 - [x] remove unused Schema
 - [x] joins
 - [x] table alias
+- [x] general aliases
+- [x] unified response
 - [ ] change Schema
 - [ ] Key-Value Store Shortcut
 - [ ] Views
@@ -28,7 +30,8 @@ Supported Databses:
 
 ```javascript
 import { DB } from "dblang";
-const db = new DB({
+const db = new DB();
+db.connect({
     host: "localhost",
     user: "root",
     password: "0123456789",
@@ -129,6 +132,20 @@ _Aliases_:
 ```javascript 
 const alias1 = TableA.createAlias("alias1");
 //alias1 can be used like a Table in select Statements.
+const alias2 = alias(avg(TableA.A1), "someAvg");
+```
+
+Get requestet Data:
+```javascript
+let response = await select([TableA.A1, TableB.B1], innerJoinOn(eq(TableA.A1, Tableb.B1)))
+    .query(db);
+
+response[0][TableA.A1];
+response[0][TableB.B1];
+
+response[i][TableA.A1];
+response[i][TableB.B1]; // i < repsonse.length
+
 ```
 
 #### Insert:
@@ -224,6 +241,7 @@ BooleanModifier:
 - `le(v1, v2, ...)`
 - `not(v1)`
 - `like(v1, v2)`
+- `exists(s)`
 
 NumberModifier:
 - `plus(v1, v2, ...)`
@@ -234,7 +252,7 @@ NumberModifier:
 StringModifier:
 - `concat(v1, v2, ...)`
 
-(v\* = string, number, boolean, null, Modifier, Aggregation, select Query, Attribute)
+(v\* = string, number, boolean, null, Modifier, Aggregation, select Query, Attribute; s = selectQuery)
 
 #### Joins
 

src/alias.ts

@@ -1,5 +1,8 @@
-import { Attribute, DB, Table } from "./db"
-import { Handler } from "./defaultHandler";
+import { Attribute, DB, Table } from "./db.js"
+import { Aggregation, Modifier } from "./dbStructure.js";
+import { Handler } from "./defaultHandler.js";
+import { QueryBuilder, selectQuery } from "./query.js";
+import { selectElements } from "./types.js";
 
 export class AttributeAlias {
     name: string;
@@ -15,12 +18,15 @@ export class AttributeAlias {
     serialize(handler: Handler) {
         return handler.builders.escapeID(this.name);
     }
-    toString(handler: Handler = this.table.dbLangDatabaseInstance.getHandler()) {
+    getString(handler: Handler = this.table.dbLangDatabaseInstance.getHandler()) {
         return this.table.serialize(handler) + "." + this.serialize(handler);
     }
-    toStringFunc(handler: Handler) {
+    getStringFunc(handler: Handler) {
         return this.table.serialize(handler) + "(" + this.serialize(handler) + ")";
     }
+    toString() {
+        return this.table.dbLangTableName + "_" + this.name;
+    }
 }
 
 export class TableAlias {
@@ -52,3 +58,33 @@ export class TableAlias {
         return handler.builders.escapeID(this.dbLangTableName);
     }
 }
+
+export class Alias {
+    alias: string;
+    a: selectElements;
+
+    constructor(a: selectElements, alias: string) {
+        this.alias = alias;
+        this.a = a;
+    }
+
+    serialize(handler: Handler) {
+        let builder = new QueryBuilder();
+        if (this.a instanceof Attribute || this.a instanceof AttributeAlias)
+            builder.addCode(this.a.getString(handler) + " " + handler.builders.escapeID(this.a.toString()));
+        else if (this.a instanceof Modifier || this.a instanceof selectQuery || this.a instanceof Aggregation || this.a instanceof Alias) {
+            builder.addCode("(");
+            builder.append(this.a.serialize(handler));
+            builder.addCode(")");
+        } else {
+            builder.addInjection(this.a);
+        }
+        return builder;
+    }
+    getString(handler: Handler) {
+        return this.serialize(handler);
+    }
+    toString() {
+        return this.alias;
+    }
+}

src/db.ts

@@ -1,23 +1,33 @@
 import mariadb from 'mariadb';
-import { checkConstraint, Constraint, Datatype, foreignConstraint, uniqueConstraint } from './dbStructure';
-import { Handler } from './defaultHandler';
-import { Query } from './query';
-import { attributeSettings, extendedAttributeSettings, onAction, dbType } from './types';
-import { TableAlias } from "./alias"
+import { checkConstraint, Constraint, Datatype, foreignConstraint, uniqueConstraint } from './dbStructure.js';
+import { Handler } from './defaultHandler.js';
+import { Query } from './query.js';
+import { attributeSettings, extendedAttributeSettings, onAction, dbType, order } from './types.js';
+import { TableAlias } from "./alias.js"
+import { insertResponse, readResponse, writeResponse, singleResponse } from "./responses.js"
 //import { postgresHandler } from "./postgresHandler"
 
+declare module "mariadb" {
+    interface Pool{
+        on(ev: 'error', callback: () => void): Pool;
+    }
+}
 
 export class DB {
     tables: Table[] = [];
-    handler: Handler;
-    name: string;
-    type: dbType;
+    handler!: Handler;
+    name!: string;
+    type!: dbType;
     mariaPool!: mariadb.Pool;
+    private connected = false;
     //pgPool!: pg.Pool;
-    constructor({ host, user, password, database, connectionLimit = 5, databaseType = dbType.mariadb }: { host: string, user: string, password: string, database: string, connectionLimit: number, databaseType: dbType }) {
+    connect({ host, user, password, database, port = 3306, connectionLimit = 5, databaseType = dbType.mariadb }: { host: string, user: string, password: string, database: string, port?: number, connectionLimit?: number, databaseType?: dbType }) {
+        this.connected = true;
         this.type = databaseType;
         if (databaseType == dbType.mariadb) {
-            this.mariaPool = mariadb.createPool({ host, user, password, database, connectionLimit, multipleStatements: true });
+            this.mariaPool = mariadb.createPool({ host, user, password, port, database, connectionLimit, multipleStatements: true });
+            // catch errors
+            this.mariaPool.on("error",()=>{});
             this.handler = new Handler(this);
         }
         /*else if (databaseType == dbType.postgres) {
@@ -28,8 +38,9 @@ export class DB {
 
         this.name = database;
     }
-    async query(query: Query) {
-        console.log(query);
+    async query(query: Query, printQuery = false) {
+        if (!this.connected) throw new Error("Not connected yet!");
+        if (printQuery) console.log(query);
         if (this.type == dbType.mariadb) return await this.mariaPool.query(query);
         /*else if (this.type == dbType.postgres) {
             let res = await this.pgPool.query(query.sql, query.values);
@@ -39,10 +50,12 @@ export class DB {
         else throw new Error("Invalid Database Type!");
     }
     getHandler() {
+        if (!this.connected) throw new Error("Not connected yet!");
         return this.handler;
     }
 
     async sync(force = false) {
+        if (!this.connected) throw new Error("Not connected yet!");
         let handler = this.getHandler();
         await handler.syncDB(this, handler, force);
     }
@@ -58,8 +71,10 @@ export class DB {
         return null;
     }
     async close() {
+        if (!this.connected) throw new Error("Not connected yet!");
         if (this.type == dbType.mariadb && this.mariaPool) await this.mariaPool.end();
         //if (this.type == dbType.postgres && this.pgPool) await this.pgPool.end();
+        this.connected = false;
     }
 }
 
@@ -89,13 +104,13 @@ export class Attribute {
                 [this]
             ))
         }
-        if (ops.foreginKey != null) {
+        if (ops.foreignKey != null) {
             table.addConstraint(new foreignConstraint(
-                table.dbLangDatabaseInstance.name + "_" + table.dbLangTableName + "_" + name + "_foreign_constraint_to_" + ops.foreginKey.link.name,
+                table.dbLangDatabaseInstance.name + "_" + table.dbLangTableName + "_" + name + "_foreign_constraint_to_" + ops.foreignKey.link.name,
                 [this],
-                [ops.foreginKey.link],
-                ops.foreginKey.onDelete,
-                ops.foreginKey.onUpdate
+                [ops.foreignKey.link],
+                ops.foreignKey.onDelete,
+                ops.foreignKey.onUpdate
             ));
         }
     }
@@ -108,12 +123,15 @@ export class Attribute {
     serialize(handler: Handler) {
         return handler.builders.escapeID(this.name);
     }
-    toString(handler: Handler = this.table.dbLangDatabaseInstance.getHandler()) {
+    getString(handler: Handler = this.table.dbLangDatabaseInstance.getHandler()) {
         return this.table.serialize(handler) + "." + this.serialize(handler);
     }
     toStringFunc(handler: Handler) {
         return this.table.serialize(handler) + "(" + this.serialize(handler) + ")";
     }
+    toString() {
+        return this.table.dbLangTableName + "_" + this.name;
+    }
 }
 
 
@@ -152,7 +170,8 @@ export class Table {
         }));
     }
     addConstraint(c: Constraint) {
-        c.check(this);
+        let check = c.check(this);
+        if(typeof check == "string") throw new Error(check);
         this.dbLangConstrains.push(c);
     }
     createAlias(name: string) {
@@ -160,6 +179,7 @@ export class Table {
     }
 }
 
-export * from './funcs';
-export { onAction };
+export * from './funcs.js';
+export { onAction, order };
 export { dbType as databaseType }
+export { readResponse, writeResponse, insertResponse, singleResponse }

src/dbStructure.ts

@@ -1,7 +1,8 @@
-import { Attribute, Table } from "./db";
-import { Handler } from "./defaultHandler";
-import { QueryBuilder } from "./query";
-import { allModifierInput, joinElements, joinType, onAction, primaryData, serializeReturn } from "./types";
+import { Attribute, Table } from "./db.js";
+import { Handler } from "./defaultHandler.js";
+import { QueryBuilder } from "./query.js";
+import { sha256 } from "./tools.js";
+import { allModifierInput, joinElements, joinType, onAction, primaryData, serializeReturn } from "./types.js";
 
 export class Datatype {
     type: string;
@@ -110,6 +111,7 @@ export class checkConstraint implements Constraint {
     checkQuery: BooleanModifier;
     name: string;
     constructor(name: string, check: BooleanModifier) {
+        if (name.length > 64) name = sha256(name);
         this.name = name.toLowerCase();
         this.checkQuery = check;
     }
@@ -125,14 +127,17 @@ export class uniqueConstraint implements Constraint {
     name: string;
     attrs: Attribute[];
     constructor(name: string, attrs: Attribute[]) {
+        if (name.length > 64) name = sha256(name);
         this.name = name.toLowerCase();
         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 {
@@ -147,6 +152,7 @@ export class foreignConstraint implements Constraint {
     onUpdate: onAction;
     onDelete: onAction;
     constructor(name: string, from: Attribute[], to: Attribute[], onDelete: onAction = onAction.nothing, onUpdate: onAction = onAction.nothing) {
+        if (name.length > 64) name = sha256(name);
         this.name = name.toLowerCase();
         this.fromAttrs = from;
         this.toAttrs = to;
@@ -160,7 +166,7 @@ export class foreignConstraint implements Constraint {
         let table = this.toAttrs[0].table;
         for (let i = 0; i < this.toAttrs.length; i++) {
             if (table != this.toAttrs[i].table) return "Referenced Attributes must be in one Table.";
-            if (this.toAttrs[i].ops.primaryKey) return "Can not reference non primary keys.";
+            if (!this.toAttrs[i].ops.primaryKey) return "Can not reference non primary keys.";
         }
         for (let i = 0; i < this.fromAttrs.length; i++) {
             if (this.fromAttrs[i].table != t) return "Referencing Attributes must be in host Table.";

src/defaultHandler.ts

@@ -1,8 +1,9 @@
-import { AttributeAlias, TableAlias } from "./alias";
-import { Attribute, DB, Table } from "./db"
-import { Aggregation, checkConstraint, joinCross, Datatype, foreignConstraint, Modifier, joinNatural, onJoin, uniqueConstraint, usingJoin } from "./dbStructure"
-import { insertQuery, Query, QueryBuilder, removeQuery, selectQuery, updateQuery } from "./query"
-import { allModifierInput, joinType, onAction, primaryData } from "./types"
+import { Alias, AttributeAlias, TableAlias } from "./alias.js";
+import { Attribute, DB, insertResponse, readResponse, Table, writeResponse } from "./db.js"
+import { Aggregation, checkConstraint, joinCross, Datatype, foreignConstraint, Modifier, joinNatural, onJoin, uniqueConstraint, usingJoin } from "./dbStructure.js"
+import { insertQuery, Query, QueryBuilder, removeQuery, selectQuery, updateQuery } from "./query.js"
+import { allModifierInput, joinType, onAction, order, primaryData } from "./types.js"
+import { sha256 } from "./tools.js"
 
 export class Handler {
     db: DB;
@@ -120,6 +121,21 @@ export class Handler {
             return found == fromAttrs.length && found == toAttrs.length;
         }
 
+        function freeForUpdate(attr: string, table: string, start = false, pool = del) {
+            for (let i = 0; i < key.length; i++) {
+                const k = key[i];
+                if (
+                    ((k.REFERENCED_TABLE_NAME ?? k.referenced_table_name) == table
+                        && (k.REFERENCED_COLUMN_NAME ?? k.referenced_column_name).toLowerCase() == attr.toLowerCase())
+                    || (start && (k.TABLE_NAME ?? k.table_name) == table
+                        && (k.COLUMN_NAME ?? k.column_name).toLowerCase() == attr.toLowerCase() && (k.REFERENCED_COLUMN_NAME ?? k.referenced_column_name) != null)
+                ) {
+                    pool.appendEnding(handler.querys.removeForeignKey(handler, (k.TABLE_NAME ?? k.table_name), (k.CONSTRAINT_NAME ?? k.constraint_name)));
+                    key.splice(i--, 1);
+                }
+            }
+        }
+
         //delete check and unused/false(unique, foreign) constraints
         for (let i = 0; i < constraints.length; i++) {
             const c = constraints[i];
@@ -129,7 +145,19 @@ export class Handler {
                 if (
                     (typeof tableData[c.TABLE_NAME ?? c.table_name] == "undefined" && deleteInDB)
                     || !checkUniqueIsVaild((c.CONSTRAINT_NAME ?? c.constraint_name), (c.TABLE_NAME ?? c.table_name))
-                ) del.appendEnding(handler.querys.removeUnique(handler, (c.TABLE_NAME ?? c.table_name), (c.CONSTRAINT_NAME ?? c.constraint_name)));
+                ) {
+                    const uTName = (c.TABLE_NAME ?? c.table_name);
+                    const uCName = (c.CONSTRAINT_NAME ?? c.constraint_name);
+                    for (let j = 0; j < key.length; j++) {
+                        if (
+                            (key[j].CONSTRAINT_NAME ?? key[j].constraint_name) == uCName
+                            && (key[j].TABLE_NAME ?? key[j].table_name) == uTName
+                        ) {
+                            freeForUpdate((key[j].COLUMN_NAME ?? key[j].column_name), uTName, true);
+                        }
+                    }
+                    del.appendEnding(handler.querys.removeUnique(handler, uTName, uCName));
+                }
             } else if ((c.CONSTRAINT_TYPE ?? c.constraint_type) == "FOREIGN KEY") {
                 if (
                     (typeof tableData[c.TABLE_NAME ?? c.table_name] == "undefined" && deleteInDB)
@@ -142,19 +170,6 @@ export class Handler {
             if (typeof tableData[allTables[i]] == "undefined") del.appendEnding(handler.querys.deleteTable(handler, allTables[i]));
         }
 
-        function freeForUpdate(attr: string, table: string) {
-            for (let i = 0; i < key.length; i++) {
-                const k = key[i];
-                if (
-                    (k.REFERENCED_TABLE_NAME ?? k.referenced_table_name) == table
-                    && (k.REFERENCED_COLUMN_NAME ?? k.referenced_column_name).toLowerCase() == attr.toLowerCase()
-                ) {
-                    del.appendEnding(handler.querys.removeForeignKey(handler, (k.TABLE_NAME ?? k.table_name), (k.CONSTRAINT_NAME ?? k.constraint_name)));
-                    key.splice(i--, 1);
-                }
-            }
-        }
-
         //create tables
         for (let i = 0; i < db.tables.length; i++) {
             const table = db.tables[i];
@@ -180,31 +195,46 @@ export class Handler {
                     const a = table.dbLangTableAttributes[keys[j]];
                     const attrData = tableD[keys[j]];
                     if (attrData == null) {
+                        if (a.ops.autoIncrement) {
+                            a.ops.autoIncrement = false;
                             create.appendEnding(handler.querys.addColumn(handler, a));
-                        changePrimary = true;
+                            a.ops.autoIncrement = true;
+                            connst.appendEnding(handler.querys.addColumn(handler, a));
+                        }
+                        else create.appendEnding(handler.querys.addColumn(handler, a));
+                        if (a.ops.primaryKey) changePrimary = true;
                     } else if (
                         !handler.builders.compareDatatypes(handler, a.type, attrData.Type) ||
                         a.ops.default != attrData.Default ||
                         (!!a.ops.notNull || !!a.ops.autoIncrement || !!a.ops.primaryKey) != (attrData.Null == "NO") ||
                         (!!a.ops.autoIncrement) != (attrData.Extra == "auto_increment")
                     ) {
-                        /*console.log(!handler.builders.compareDatatypes(handler, a.type, attrData.Type), "|",
-                            a.ops.default, attrData.Default, "|",
-                            (!!a.ops.notNull || !!a.ops.autoIncrement || !!a.ops.primaryKey), (attrData.Null == "NO"), "|",
-                            (!!a.ops.autoIncrement), (attrData.Extra == "auto_increment"));*/
                         freeForUpdate(a.name, a.table.dbLangTableName);
-                        if (a.ops.autoIncrement)
+                        if (a.ops.autoIncrement) {
+                            a.ops.autoIncrement = false;
                             create.appendEnding(handler.querys.changeColumn(handler, a));
+                            a.ops.autoIncrement = true;
+                            connst.appendEnding(handler.querys.changeColumn(handler, a));
                         }
-                    if (attrData == null) {
-                        changePrimary = true;
-                    } else {
+                        else create.appendEnding(handler.querys.changeColumn(handler, a));
+                    }
+                    if (attrData != null) {
                         if ((attrData.Key == "PRI") != (!!a.ops.primaryKey)) {
                             freeForUpdate(a.name, a.table.dbLangTableName);
                             changePrimary = true;
                         }
                     }
                 }
+                if (changePrimary) for (let j = 0; j < keys.length; j++) {
+                    const a = table.dbLangTableAttributes[keys[j]];
+                    if (a.ops.autoIncrement) {
+                        a.ops.autoIncrement = false;
+                        create.appendEnding(handler.querys.changeColumn(handler, a));
+                        a.ops.autoIncrement = true;
+                        connst.appendEnding(handler.querys.changeColumn(handler, a));
+                    }
+                    freeForUpdate(a.name, a.table.dbLangTableName, true, create);
+                }
             }
             if (changePrimary) {
                 create.appendEnding(handler.querys.removePrimaryKey(handler, table.dbLangTableName));
@@ -237,7 +267,24 @@ export class Handler {
         select: (handler: Handler, q: selectQuery): QueryBuilder => {
             const builder = new QueryBuilder();
             builder.addCode("select ");
-            builder.append(joinArg(", ")(handler, q.attr));
+            let a = q.attr;
+            for (let i = 0; i < a.length; i++) {
+                const d = a[i];
+                if (d instanceof Attribute || d instanceof AttributeAlias)
+                    builder.addCode(d.getString(handler) + " " + handler.builders.escapeID(d.toString()));
+                else if (d instanceof Alias) {
+                    builder.append(d.serialize(handler));
+                    builder.addCode(handler.builders.escapeID(d.toString()));
+                } else if (d instanceof Modifier || d instanceof selectQuery || d instanceof Aggregation) {
+                    builder.addCode("(");
+                    builder.append(d.serialize(handler));
+                    builder.addCode(")");
+                } else {
+                    builder.addInjection(d);
+                }
+                if (i + 1 < a.length) builder.addCode(", ");
+            }
+            //builder.append(joinArg(", ")(handler, q.attr));
             builder.addCode(` from `);
             if (q.from == null) {
                 builder.addCode(" DUAL");
@@ -260,6 +307,25 @@ export class Handler {
                     builder.append(q.havingD.serialize(handler));
                 }
             }
+            if (q.orderByD.length > 0) {
+                builder.addCode(" order by ");
+                for (let i = 0; i < q.orderByD.length; i++) {
+                    const d = q.orderByD[i];
+                    if (d[0] instanceof Attribute || d[0] instanceof AttributeAlias) builder.addCode(d[0].getString(handler));
+                    else if (d[0] instanceof Alias)
+                        builder.addCode(handler.builders.escapeID(d.toString()));
+                    else if (d[0] instanceof Modifier || d[0] instanceof selectQuery || d[0] instanceof Aggregation) {
+                        builder.addCode("(");
+                        builder.append(d[0].serialize(handler));
+                        builder.addCode(")");
+                    } else {
+                        builder.addInjection(d[0]);
+                    }
+                    if(d[1] == order.DESC) builder.addCode(" DESC");
+                    else builder.addCode(" ASC");
+                    if (i + 1 < q.orderByD.length) builder.addCode(", ");
+                }
+            }
             if (q.limitD != null) {
                 if (q.limitOffsetD == null) {
                     builder.addCode(" limit ");
@@ -280,7 +346,7 @@ export class Handler {
         },
         insert: (hander: Handler, q: insertQuery): QueryBuilder => {
             const qb = new QueryBuilder();
-            qb.addCode("INSERT INTO ");
+            qb.addCode("INSERT IGNORE INTO ");
             qb.addCode(q.attrs[0].table.serialize(hander));
             qb.addCode("(");
             qb.addCodeCommaSeperated(q.attrs.map(a => a.serialize(hander)));
@@ -308,6 +374,8 @@ export class Handler {
                 qb.addCode(s[0].serialize(handler));
                 qb.addCode(" = (");
                 if (s[1] instanceof Attribute || s[1] instanceof AttributeAlias) qb.addCode(s[1].serialize(handler));
+                else if (s[1] instanceof Alias)
+                    qb.addCode(handler.builders.escapeID(s[1].toString()));
                 else if (s[1] instanceof Modifier || s[1] instanceof selectQuery || s[1] instanceof Aggregation) {
                     qb.append(s[1].serialize(handler));
                 } else {
@@ -454,7 +522,7 @@ export class Handler {
             let primaAttr = Object.entries(table.dbLangTableAttributes)
                 .filter(([n, attr]) => !!attr.ops.primaryKey);
             const qb = new QueryBuilder();
-            if(primaAttr.length == 0) return qb;
+            if (primaAttr.length == 0) return qb;
             qb.addCode("ALTER TABLE ");
             qb.addCode(table.serialize(handler));
             qb.addCode(" add PRIMARY KEY if not exists (");
@@ -548,6 +616,7 @@ export class Handler {
         },
         escapeID: (key: string): string => {
             if (!key || key === "" || key.includes('\u0000')) throw new Error("Can not escape empty key or with null unicode!");
+            if (key.length > 64) key = sha256(key);
             if (key.match(/^`.+`$/g)) return key;
             return `\`${key.replace(/`/g, '``')}\``;
         },
@@ -566,12 +635,18 @@ export class Handler {
         },
     }
 
+    responses = {
+        readResponse: (resp: any) => new readResponse(resp),
+        writeResponse: (resp: any) => new writeResponse(resp.affectedRows),
+        insertResponse: (resp: any) => new insertResponse(resp.affectedRows, resp.insertId),
+    }
+
     aggregations = {
-        count: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "count(" + a.toString(handler) + ")" }]),
-        sum: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "sum(" + a.toString(handler) + ")" }]),
-        avg: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "avg(" + a.toString(handler) + ")" }]),
-        min: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "min(" + a.toString(handler) + ")" }]),
-        max: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "max(" + a.toString(handler) + ")" }]),
+        count: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "count(" + a.getString(handler) + ")" }]),
+        sum: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "sum(" + a.getString(handler) + ")" }]),
+        avg: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "avg(" + a.getString(handler) + ")" }]),
+        min: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "min(" + a.getString(handler) + ")" }]),
+        max: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "max(" + a.getString(handler) + ")" }]),
     }
 
     joins = {
@@ -580,6 +655,7 @@ export class Handler {
             for (let i = 0; i < j.tables.length; i++) {
                 const t = j.tables[i];
                 if (t instanceof Table) qb.addCode(t.serialize(handler));
+                else if (t instanceof TableAlias) qb.addCode(t.serializeAlias(handler));
                 else {
                     qb.addCode("(");
                     qb.append(t.serialize(handler));
@@ -598,6 +674,7 @@ export class Handler {
         using: (handler: Handler, j: usingJoin) => {
             const qb = new QueryBuilder();
             if (j.tableA instanceof Table) qb.addCode(j.tableA.serialize(handler));
+            else if (j.tableA instanceof TableAlias) qb.addCode(j.tableA.serializeAlias(handler));
             else {
                 qb.addCode("(");
                 qb.append(j.tableA.serialize(handler));
@@ -608,10 +685,11 @@ export class Handler {
             if (j.type == joinType.right) qb.addCode("right ");
             if (j.type == joinType.full) qb.addCode("full ");
             qb.addCode("join ");
-            if (j.tableA instanceof Table) qb.addCode(j.tableA.serialize(handler));
+            if (j.tableB instanceof Table) qb.addCode(j.tableB.serialize(handler));
+            else if (j.tableB instanceof TableAlias) qb.addCode(j.tableB.serializeAlias(handler));
             else {
                 qb.addCode("(");
-                qb.append(j.tableA.serialize(handler));
+                qb.append(j.tableB.serialize(handler));
                 qb.addCode(")");
             }
             qb.addCode(" using (");
@@ -622,6 +700,7 @@ export class Handler {
         on: (handler: Handler, j: onJoin) => {
             const qb = new QueryBuilder();
             if (j.tableA instanceof Table) qb.addCode(j.tableA.serialize(handler));
+            else if (j.tableA instanceof TableAlias) qb.addCode(j.tableA.serializeAlias(handler));
             else {
                 qb.addCode("(");
                 qb.append(j.tableA.serialize(handler));
@@ -632,10 +711,11 @@ export class Handler {
             if (j.type == joinType.right) qb.addCode("right ");
             if (j.type == joinType.full) qb.addCode("full ");
             qb.addCode("join ");
-            if (j.tableA instanceof Table) qb.addCode(j.tableA.serialize(handler));
+            if (j.tableB instanceof Table) qb.addCode(j.tableB.serialize(handler));
+            else if (j.tableB instanceof TableAlias) qb.addCode(j.tableB.serializeAlias(handler));
             else {
                 qb.addCode("(");
-                qb.append(j.tableA.serialize(handler));
+                qb.append(j.tableB.serialize(handler));
                 qb.addCode(")");
             }
             qb.addCode(" on (");
@@ -648,6 +728,7 @@ export class Handler {
             for (let i = 0; i < j.tables.length; i++) {
                 const t = j.tables[i];
                 if (t instanceof Table) qb.addCode(t.serialize(handler));
+                else if (t instanceof TableAlias) qb.addCode(t.serializeAlias(handler));
                 else {
                     qb.addCode("(");
                     qb.append(t.serialize(handler));
@@ -673,7 +754,9 @@ export class Handler {
         divide: joinArg("-/"),
         not: (handler: Handler, a: allModifierInput[]): QueryBuilder => {
             let e = a[0];
-            if (e instanceof Attribute || e instanceof AttributeAlias) return new QueryBuilder([{ data: "not (" + e.toString(handler) + ")" }])
+            if (e instanceof Attribute || e instanceof AttributeAlias) return new QueryBuilder([{ data: "not (" + e.getString(handler) + ")" }])
+            if (e instanceof Alias)
+                return new QueryBuilder([{ data: handler.builders.escapeID(e.toString()) }]);
             if (e instanceof Modifier || e instanceof selectQuery || e instanceof Aggregation) {
                 const builder = new QueryBuilder();
                 builder.addCode("not (");
@@ -689,14 +772,18 @@ export class Handler {
         },
         like: (handler: Handler, a: allModifierInput[]): QueryBuilder => {
             const builder = new QueryBuilder();
-            if (a[0] instanceof Attribute || a[0] instanceof AttributeAlias) builder.addCode(a[0].toString());
+            if (a[0] instanceof Attribute || a[0] instanceof AttributeAlias) builder.addCode(a[0].getString());
+            else if (a[0] instanceof Alias)
+                builder.addCode(handler.builders.escapeID(a[0].toString()));
             else if (a[0] instanceof Modifier || a[0] instanceof selectQuery || a[0] instanceof Aggregation) {
                 builder.append(a[0].serialize(handler));
             } else {
                 builder.addInjection(a[0]);
             }
             builder.addCode(" LIKE ");
-            if (a[1] instanceof Attribute || a[1] instanceof AttributeAlias) builder.addCode(a[1].toString());
+            if (a[1] instanceof Attribute || a[1] instanceof AttributeAlias) builder.addCode(a[1].getString());
+            else if (a[1] instanceof Alias)
+                builder.addCode(handler.builders.escapeID(a[1].toString()));
             else if (a[1] instanceof Modifier || a[1] instanceof selectQuery || a[1] instanceof Aggregation) {
                 builder.append(a[1].serialize(handler));
             } else {
@@ -704,12 +791,53 @@ export class Handler {
             }
             return builder;
         },
+        regexp: (handler: Handler, a: allModifierInput[]): QueryBuilder => {
+            const builder = new QueryBuilder();
+            if (a[0] instanceof Attribute || a[0] instanceof AttributeAlias) builder.addCode(a[0].getString());
+            else if (a[0] instanceof Alias)
+                builder.addCode(handler.builders.escapeID(a[0].toString()));
+            else if (a[0] instanceof Modifier || a[0] instanceof selectQuery || a[0] instanceof Aggregation) {
+                builder.append(a[0].serialize(handler));
+            } else {
+                builder.addInjection(a[0]);
+            }
+            builder.addCode(" REGEXP ");
+            if (a[1] instanceof Attribute || a[1] instanceof AttributeAlias) builder.addCode(a[1].getString());
+            else if (a[1] instanceof Alias)
+                builder.addCode(handler.builders.escapeID(a[1].toString()));
+            else if (a[1] instanceof Modifier || a[1] instanceof selectQuery || a[1] instanceof Aggregation) {
+                builder.append(a[1].serialize(handler));
+            } else {
+                builder.addInjection(a[1]);
+            }
+            return builder;
+        },
+        exists: (handler: Handler, a: allModifierInput[]): QueryBuilder => {
+            let e = a[0];
+            if (e instanceof Attribute || e instanceof AttributeAlias) return new QueryBuilder([{ data: "exists (" + e.getString(handler) + ")" }])
+            if (e instanceof Alias)
+                return new QueryBuilder([{ data: handler.builders.escapeID(e.toString()) }]);
+            if (e instanceof Modifier || e instanceof selectQuery || e instanceof Aggregation) {
+                const builder = new QueryBuilder();
+                builder.addCode("exists (");
+                builder.append(e.serialize(handler));
+                builder.addCode(")");
+                return builder;
+            }
+            return new QueryBuilder([
+                { data: "exists (" },
+                { inject: true, data: e },
+                { data: ")" }
+            ]);
+        },
         concat: (handler: Handler, a: allModifierInput[]): QueryBuilder => {
             const builder = new QueryBuilder();
             builder.addCode("CONCAT(");
             for (let i = 0; i < a.length; i++) {
                 const e = a[i];
-                if (e instanceof Attribute || e instanceof AttributeAlias) builder.addCode(e.toString());
+                if (e instanceof Attribute || e instanceof AttributeAlias) builder.addCode(e.getString());
+                else if (e instanceof Alias)
+                    builder.addCode(handler.builders.escapeID(e.toString()));
                 else if (e instanceof Modifier || e instanceof selectQuery || e instanceof Aggregation) {
                     builder.append(e.serialize(handler));
                 } else {
@@ -719,7 +847,25 @@ export class Handler {
             }
             builder.addCode(")");
             return builder;
+        },
+        coalesce: (handler: Handler, a: allModifierInput[]): QueryBuilder => {
+            const builder = new QueryBuilder();
+            builder.addCode("COALESCE(");
+            for (let i = 0; i < a.length; i++) {
+                const e = a[i];
+                if (e instanceof Attribute || e instanceof AttributeAlias) builder.addCode(e.getString());
+                else if (e instanceof Alias)
+                    builder.addCode(handler.builders.escapeID(e.toString()));
+                else if (e instanceof Modifier || e instanceof selectQuery || e instanceof Aggregation) {
+                    builder.append(e.serialize(handler));
+                } else {
+                    builder.addInjection(e);
                 }
+                if (i < a.length - 1) builder.addCode(", ");
+            }
+            builder.addCode(")");
+            return builder;
+        },
     }
 
     datatypes = {
@@ -807,7 +953,9 @@ function joinArg(type: string) {
         const builder = new QueryBuilder();
         for (let i = 0; i < a.length; i++) {
             const d = a[i];
-            if (d instanceof Attribute || d instanceof AttributeAlias) builder.addCode(d.toString(handler));
+            if (d instanceof Attribute || d instanceof AttributeAlias) builder.addCode(d.getString(handler));
+            else if (d instanceof Alias)
+                builder.addCode(handler.builders.escapeID(d.toString()));
             else if (d instanceof Modifier || d instanceof selectQuery || d instanceof Aggregation) {
                 builder.addCode("(");
                 builder.append(d.serialize(handler));

src/funcs.ts

@@ -1,7 +1,8 @@
-import { Attribute, Table } from "./db";
-import { Aggregation, BooleanModifier, checkConstraint, Datatype, foreignConstraint, joinCross, joinNatural, usingJoin, onJoin, NumberModifier, StringModifier, uniqueConstraint } from "./dbStructure";
-import { insertQuery, removeQuery, selectQuery, updateQuery } from "./query";
-import { allModifierInput, joinType, selectElements, selectFromElements } from "./types";
+import { Alias } from "./alias.js";
+import { Attribute, Table } from "./db.js";
+import { Aggregation, BooleanModifier, checkConstraint, Datatype, foreignConstraint, joinCross, joinNatural, usingJoin, onJoin, NumberModifier, StringModifier, uniqueConstraint } from "./dbStructure.js";
+import { insertQuery, removeQuery, selectQuery, updateQuery } from "./query.js";
+import { allModifierInput, joinType, selectElements, selectFromElements } from "./types.js";
 
 //modifiers
 export const and = (...args: BooleanModifier[]) => new BooleanModifier("and", args);
@@ -18,8 +19,12 @@ export const divide = (...args: allModifierInput[]) => new NumberModifier("divid
 
 export const not = (arg: allModifierInput) => new BooleanModifier("not", [arg]);
 export const like = (a: allModifierInput, b: allModifierInput) => new BooleanModifier("like", [a, b]);
+export const regexp = (a: allModifierInput, b: allModifierInput) => new BooleanModifier("regexp", [a, b]);
+
+export const exists = (q: selectQuery) => new BooleanModifier("exists", [q]);
 
 export const concat = (...args: allModifierInput[]) => new StringModifier("concat", args);
+export const coalesce = (...args: allModifierInput[]) => new StringModifier("coalesce", args);
 
 //aggregations
 export const count = (a: Attribute) => new Aggregation("count", a);
@@ -53,6 +58,9 @@ export const insert = (...attrs: Attribute[]) => new insertQuery(attrs);
 export const update = (table: Table) => new updateQuery(table);
 export const remove = (table: Table) => new removeQuery(table);
 
+//alias
+export const alias = (a: selectElements, name: string) => new Alias(a, name);
+
 //datatypes
 
 export const CHAR = (size: number) => new Datatype("char", [size]);

src/query.ts

@@ -1,8 +1,8 @@
-import { AttributeAlias } from "./alias";
-import { Attribute, DB, Table } from "./db";
-import { BooleanModifier, Modifier } from "./dbStructure";
-import { Handler } from "./defaultHandler";
-import { allModifierInput, primaryData, selectElements, selectFromElements, serializeReturn } from "./types";
+import { AttributeAlias } from "./alias.js";
+import { Attribute, DB, Table } from "./db.js";
+import { BooleanModifier, Modifier } from "./dbStructure.js";
+import { Handler } from "./defaultHandler.js";
+import { allModifierInput, order, primaryData, selectElements, selectFromElements, serializeReturn } from "./types.js";
 
 
 export class Query {
@@ -49,7 +49,7 @@ export class QueryBuilder {
         this.list.push(...qb.list);
     }
     appendEnding(qb: QueryBuilder) {
-        if(qb.isEmpty()) return;
+        if (qb.isEmpty()) return;
         this.append(qb);
         this.list.push([false, ";"]);
     }
@@ -84,6 +84,17 @@ export class selectQuery {
         this.havingD = m;
         return this;
     }
+
+    orderByD: ([allModifierInput, order])[] = [];
+    addOrderBy(a: allModifierInput, o: order = order.ASC) {
+        this.orderByD.push([a, o]);
+        return this;
+    }
+    orderBY(a: allModifierInput, o: order = order.ASC) {
+        this.orderByD = [[a, o]];
+        return this;
+    }
+
     limitD: number | null = null;
     limitOffsetD: number | null = null;
     limit(i: number, offset: number = 0) {
@@ -96,11 +107,12 @@ export class selectQuery {
         return handler.querys.select(handler, this);
     }
 
-    async query(db: DB) {
+    async query(db: DB, printQuery = false) {
         const handler = db.getHandler();
         const builder = this.serialize(handler);
         const s = handler.builders.query(builder);
-        return await db.query(s);
+        let readResp = await db.query(s, printQuery);
+        return handler.responses.readResponse(readResp);
     }
 }
 
@@ -133,11 +145,12 @@ export class insertQuery {
     serialize(handler: Handler): QueryBuilder {
         return handler.querys.insert(handler, this);
     }
-    async query(db: DB) {
+    async query(db: DB, printQuery = false) {
         const handler = db.getHandler();
         const builder = this.serialize(handler);
         const s = handler.builders.query(builder);
-        return await db.query(s);
+        let readResp = await db.query(s, printQuery);
+        return handler.responses.insertResponse(readResp);
     }
 }
 
@@ -161,11 +174,12 @@ export class updateQuery {
     serialize(handler: Handler): QueryBuilder {
         return handler.querys.update(handler, this);
     }
-    async query(db: DB) {
+    async query(db: DB, printQuery = false) {
         const handler = db.getHandler();
         const builder = this.serialize(handler);
         const s = handler.builders.query(builder);
-        return await db.query(s);
+        let readResp = await db.query(s, printQuery);
+        return handler.responses.writeResponse(readResp);
     }
 }
 
@@ -182,10 +196,11 @@ export class removeQuery {
     serialize(handler: Handler): QueryBuilder {
         return handler.querys.remove(handler, this);
     }
-    async query(db: DB) {
+    async query(db: DB, printQuery = false) {
         const handler = db.getHandler();
         const builder = this.serialize(handler);
         const s = handler.builders.query(builder);
-        return await db.query(s);
+        let readResp = await db.query(s, printQuery);
+        return handler.responses.writeResponse(readResp);
     }
 }

src/responses.ts

@@ -0,0 +1,37 @@
+import { AttributeAlias } from "./alias.js";
+import { Attribute } from "./db.js";
+import { primaryData } from "./types.js";
+
+export class singleResponse {
+    [key: string]: primaryData | any;
+    constructor(r: object) {
+        Object.assign(this, r);
+    }
+    getVal(a: Attribute | AttributeAlias) {
+        return this[a.toString()];
+    }
+}
+
+export class readResponse extends Array<singleResponse>{
+    constructor(rows: ({ [key: string]: primaryData })[]) {
+        super();
+        for(let i = 0; i < rows.length; i++){
+            this[i] = new singleResponse(rows[i])
+        }
+    }
+}
+
+export class writeResponse {
+    affectedRows: number;
+    constructor(affectedRows: number) {
+        this.affectedRows = affectedRows;
+    }
+}
+
+export class insertResponse extends writeResponse {
+    insertId: number;
+    constructor(affectedRows: number, insertId: number) {
+        super(affectedRows);
+        this.insertId = insertId;
+    }
+}

src/tools.ts

@@ -0,0 +1,3 @@
+import crypto from "crypto";
+
+export const sha256 = (d: any) => crypto.createHash('sha256').update(String(d)).digest('base64');

src/types.ts

@@ -1,12 +1,12 @@
-import { AttributeAlias, TableAlias } from "./alias";
-import { Attribute, Table } from "./db";
-import { Aggregation, BooleanModifier, Datatype, Joins, Modifier } from "./dbStructure";
-import { QueryBuilder, selectQuery } from "./query";
+import { Alias, AttributeAlias, TableAlias } from "./alias.js";
+import { Attribute, Table } from "./db.js";
+import { Aggregation, BooleanModifier, Datatype, Joins, Modifier } from "./dbStructure.js";
+import { QueryBuilder, selectQuery } from "./query.js";
 
 export type primaryData = string | number | boolean | null;
-export type allModifierInput = primaryData | Modifier | selectQuery | Attribute | AttributeAlias | Aggregation;
+export type allModifierInput = primaryData | Modifier | selectQuery | Attribute | AttributeAlias | Aggregation | Alias;
 
-export type selectElements = primaryData | Attribute | AttributeAlias | Aggregation | selectQuery
+export type selectElements = primaryData | Attribute | AttributeAlias | Aggregation | selectQuery | Alias;
 export type selectFromElements = TableAlias | Table | Joins | null;
 export type joinElements = Table | Joins;
 
@@ -20,7 +20,7 @@ export type attributeSettings = {
     default?: primaryData,
     notNull?: boolean
     primaryKey?: boolean,
-    foreginKey?: {
+    foreignKey?: {
         link: Attribute,
         onDelete?: onAction,
         onUpdate?: onAction
@@ -35,7 +35,7 @@ export type extendedAttributeSettings = {
     default?: primaryData,
     notNull?: boolean
     primaryKey?: boolean,
-    foreginKey?: {
+    foreignKey?: {
         link: Attribute,
         onDelete?: onAction,
         onUpdate?: onAction
@@ -64,3 +64,8 @@ export enum dbType {
     //mysql,
     postgres,
 }
+
+export enum order {
+    ASC,
+    DESC
+}

tsconfig.json

@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
-    "module": "CommonJS",
+    "target": "ES6",
+    "module": "ES6",
     "lib": ["es6"],
     "types": ["node"],
     "declaration": true,