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

Reviewed-on: #23

package-lock.json

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

package.json

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

src/db.ts

@@ -2,7 +2,7 @@ import mariadb from 'mariadb';
 import { checkConstraint, Constraint, Datatype, foreignConstraint, uniqueConstraint } from './dbStructure.js';
 import { Handler } from './defaultHandler.js';
 import { Query } from './query.js';
-import { attributeSettings, extendedAttributeSettings, onAction, dbType } from './types.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"
@@ -180,6 +180,6 @@ export class Table {
 }
 
 export * from './funcs.js';
-export { onAction };
+export { onAction, order };
 export { dbType as databaseType }
 export { readResponse, writeResponse, insertResponse, singleResponse }

src/defaultHandler.ts

@@ -2,7 +2,7 @@ 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, primaryData } from "./types.js"
+import { allModifierInput, joinType, onAction, order, primaryData } from "./types.js"
 import { sha256 } from "./tools.js"
 
 export class Handler {
@@ -121,16 +121,16 @@ export class Handler {
             return found == fromAttrs.length && found == toAttrs.length;
         }
 
-        function freeForUpdate(attr: string, table: string, start = false) {
+        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())
+                        && (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)
+                        && (k.COLUMN_NAME ?? k.column_name).toLowerCase() == attr.toLowerCase() && (k.REFERENCED_COLUMN_NAME ?? k.referenced_column_name) != null)
                 ) {
-                    del.appendEnding(handler.querys.removeForeignKey(handler, (k.TABLE_NAME ?? k.table_name), (k.CONSTRAINT_NAME ?? k.constraint_name)));
+                    pool.appendEnding(handler.querys.removeForeignKey(handler, (k.TABLE_NAME ?? k.table_name), (k.CONSTRAINT_NAME ?? k.constraint_name)));
                     key.splice(i--, 1);
                 }
             }
@@ -195,7 +195,13 @@ export class Handler {
                     const a = table.dbLangTableAttributes[keys[j]];
                     const attrData = tableD[keys[j]];
                     if (attrData == null) {
-                        create.appendEnding(handler.querys.addColumn(handler, a));
+                        if (a.ops.autoIncrement) {
+                            a.ops.autoIncrement = false;
+                            create.appendEnding(handler.querys.addColumn(handler, a));
+                            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) ||
@@ -203,10 +209,6 @@ export class Handler {
                         (!!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) {
                             a.ops.autoIncrement = false;
@@ -223,6 +225,16 @@ export class Handler {
                         }
                     }
                 }
+                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));
@@ -295,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 ");
@@ -816,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 = {

src/funcs.ts

@@ -24,6 +24,7 @@ export const regexp = (a: allModifierInput, b: allModifierInput) => new BooleanM
 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);

src/query.ts

@@ -2,7 +2,7 @@ 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, primaryData, selectElements, selectFromElements, serializeReturn } from "./types.js";
+import { allModifierInput, order, primaryData, selectElements, selectFromElements, serializeReturn } from "./types.js";
 
 
 export class Query {
@@ -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) {

src/types.ts

@@ -63,4 +63,9 @@ export enum dbType {
     mariadb,
     //mysql,
     postgres,
+}
+
+export enum order {
+    ASC,
+    DESC
 }