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 {
@@ -307,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 ");

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

@@ -64,3 +64,8 @@ export enum dbType {
     //mysql,
     postgres,
 }
+
+export enum order {
+    ASC,
+    DESC
+}