readme.md

@@ -13,7 +13,6 @@ Features:
 - [x] remove unused Schema
 - [x] joins
 - [x] table alias
-- [x] unified response
 - [ ] change Schema
 - [ ] Key-Value Store Shortcut
 - [ ] Views
@@ -132,19 +131,6 @@ const alias1 = TableA.createAlias("alias1");
 //alias1 can be used like a Table in select Statements.
 ```
 
-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:
 ```javascript
 import { select } from "dblang"

src/alias.ts

@@ -15,15 +15,12 @@ export class AttributeAlias {
     serialize(handler: Handler) {
         return handler.builders.escapeID(this.name);
     }
-    getString(handler: Handler = this.table.dbLangDatabaseInstance.getHandler()) {
+    toString(handler: Handler = this.table.dbLangDatabaseInstance.getHandler()) {
         return this.table.serialize(handler) + "." + this.serialize(handler);
     }
-    getStringFunc(handler: Handler) {
+    toStringFunc(handler: Handler) {
         return this.table.serialize(handler) + "(" + this.serialize(handler) + ")";
     }
-    toString(){
-        return this.table.dbLangTableName + "_" + this.name; 
-    }
 }
 
 export class TableAlias {

src/db.ts

@@ -4,7 +4,7 @@ import { Handler } from './defaultHandler';
 import { Query } from './query';
 import { attributeSettings, extendedAttributeSettings, onAction, dbType } from './types';
 import { TableAlias } from "./alias"
-import { insertResponse, readResponse, writeResponse, singleResponse } from "./responses"
+import { insertResponse, readResponse, writeResponse } from "./responses"
 //import { postgresHandler } from "./postgresHandler"
 
 
@@ -109,15 +109,12 @@ export class Attribute {
     serialize(handler: Handler) {
         return handler.builders.escapeID(this.name);
     }
-    getString(handler: Handler = this.table.dbLangDatabaseInstance.getHandler()) {
+    toString(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; 
-    }
 }
 
 
@@ -167,4 +164,4 @@ export class Table {
 export * from './funcs';
 export { onAction };
 export { dbType as databaseType }
-export { readResponse, writeResponse, insertResponse, singleResponse }
+export { readResponse, writeResponse, insertResponse }

src/defaultHandler.ts

@@ -241,21 +241,7 @@ export class Handler {
         select: (handler: Handler, q: selectQuery): QueryBuilder => {
             const builder = new QueryBuilder();
             builder.addCode("select ");
-            let a = q.attr;
+            builder.append(joinArg(", ")(handler, 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 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");
@@ -591,11 +577,11 @@ export class Handler {
     }
 
     aggregations = {
-        count: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "count(" + a.getString(handler) + ")" }]),
+        count: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "count(" + a.toString(handler) + ")" }]),
-        sum: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "sum(" + a.getString(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.getString(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.getString(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.getString(handler) + ")" }]),
+        max: (handler: Handler, a: Attribute): QueryBuilder => new QueryBuilder([{ data: "max(" + a.toString(handler) + ")" }]),
     }
 
     joins = {
@@ -604,7 +590,6 @@ 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));
@@ -623,7 +608,6 @@ 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));
@@ -634,11 +618,10 @@ export class Handler {
             if (j.type == joinType.right) qb.addCode("right ");
             if (j.type == joinType.full) qb.addCode("full ");
             qb.addCode("join ");
-            if (j.tableB instanceof Table) qb.addCode(j.tableB.serialize(handler));
+            if (j.tableA instanceof Table) qb.addCode(j.tableA.serialize(handler));
-            else if (j.tableB instanceof TableAlias) qb.addCode(j.tableB.serializeAlias(handler));
             else {
                 qb.addCode("(");
-                qb.append(j.tableB.serialize(handler));
+                qb.append(j.tableA.serialize(handler));
                 qb.addCode(")");
             }
             qb.addCode(" using (");
@@ -649,7 +632,6 @@ 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));
@@ -660,11 +642,10 @@ export class Handler {
             if (j.type == joinType.right) qb.addCode("right ");
             if (j.type == joinType.full) qb.addCode("full ");
             qb.addCode("join ");
-            if (j.tableB instanceof Table) qb.addCode(j.tableB.serialize(handler));
+            if (j.tableA instanceof Table) qb.addCode(j.tableA.serialize(handler));
-            else if (j.tableB instanceof TableAlias) qb.addCode(j.tableB.serializeAlias(handler));
             else {
                 qb.addCode("(");
-                qb.append(j.tableB.serialize(handler));
+                qb.append(j.tableA.serialize(handler));
                 qb.addCode(")");
             }
             qb.addCode(" on (");
@@ -677,7 +658,6 @@ 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));
@@ -703,7 +683,7 @@ 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.getString(handler) + ")" }])
+            if (e instanceof Attribute || e instanceof AttributeAlias) return new QueryBuilder([{ data: "not (" + e.toString(handler) + ")" }])
             if (e instanceof Modifier || e instanceof selectQuery || e instanceof Aggregation) {
                 const builder = new QueryBuilder();
                 builder.addCode("not (");
@@ -719,14 +699,14 @@ 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].getString());
+            if (a[0] instanceof Attribute || a[0] instanceof AttributeAlias) builder.addCode(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].getString());
+            if (a[1] instanceof Attribute || a[1] instanceof AttributeAlias) builder.addCode(a[1].toString());
             else if (a[1] instanceof Modifier || a[1] instanceof selectQuery || a[1] instanceof Aggregation) {
                 builder.append(a[1].serialize(handler));
             } else {
@@ -736,14 +716,14 @@ export class Handler {
         },
         regexp: (handler: Handler, a: allModifierInput[]): QueryBuilder => {
             const builder = new QueryBuilder();
-            if (a[0] instanceof Attribute || a[0] instanceof AttributeAlias) builder.addCode(a[0].getString());
+            if (a[0] instanceof Attribute || a[0] instanceof AttributeAlias) builder.addCode(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());
+            if (a[1] instanceof Attribute || a[1] instanceof AttributeAlias) builder.addCode(a[1].toString());
             else if (a[1] instanceof Modifier || a[1] instanceof selectQuery || a[1] instanceof Aggregation) {
                 builder.append(a[1].serialize(handler));
             } else {
@@ -756,7 +736,7 @@ export class Handler {
             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.getString());
+                if (e instanceof Attribute || e instanceof AttributeAlias) builder.addCode(e.toString());
                 else if (e instanceof Modifier || e instanceof selectQuery || e instanceof Aggregation) {
                     builder.append(e.serialize(handler));
                 } else {
@@ -854,7 +834,7 @@ 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.getString(handler));
+            if (d instanceof Attribute || d instanceof AttributeAlias) builder.addCode(d.toString(handler));
             else if (d instanceof Modifier || d instanceof selectQuery || d instanceof Aggregation) {
                 builder.addCode("(");
                 builder.append(d.serialize(handler));

src/responses.ts

@@ -1,34 +1,21 @@
-import { AttributeAlias } from "./alias";
-import { Attribute } from "./db";
-import { primaryData } from "./types";
 
-export class singleResponse {
+export class readResponse extends Array{
-    [key: string]: primaryData | any;
+    constructor(rows:({[key: string]: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();
-        this.push(...rows.map(r => new singleResponse(r)));
+        this.push(...rows);
     }
 }
 
-export class writeResponse {
+export class writeResponse{
     affectedRows: number;
-    constructor(affectedRows: number) {
+    constructor(affectedRows: number){
         this.affectedRows = affectedRows;
     }
 }
 
-export class insertResponse extends writeResponse {
+export class insertResponse extends writeResponse{
     insertId: number;
-    constructor(affectedRows: number, insertId: number) {
+    constructor(affectedRows: number, insertId: number){
         super(affectedRows);
         this.insertId = insertId;
     }