Merge 56e21ac into 3dc80d1

Paskalouis · Sep 6, 2019 · 04e6217 · 04e6217
2 parents 3dc80d1 + 56e21ac
commit 04e6217
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,11 @@ Yarn:
 ```javascript
 const QueryBuilder = require('fish-query');
 
-const queryClass = new QueryBuilder();
+const config = {
+	datastore: 'postgresql'	//Currently support 'postgresql' and 'sqlserver'. Default to 'postgresql' when not specified.
+};
+
+const queryClass = new QueryBuilder(config);
 
 let queryString = queryClass
                     .addSelect('firstName')

diff --git a/index.js b/index.js
@@ -1,12 +1,15 @@
 class QueryBuilder {
-    constructor() {
+    constructor(config) {
+        let { datastore } = config ? config : { datastore: 'postgresql' } ;
+
         this.selectField = [];
         this.fromField = [];
         this.whereField = [];
         this.orderField = [];
         this.firstTable = '';
         this.limit = null;
         this.offset = null;
+        this.datastore = datastore;
     }
 
     addSelect(value) {
@@ -68,7 +71,7 @@ class QueryBuilder {
                 }
                 else if (typeof select === 'object') {
                     selectString = `${select.tableName}."${select.columnName}"`;
-                    if (select.columnAlias) selectString += ` AS ${select.columnAlias}`;
+                    if (select.columnAlias) selectString += ` AS "${select.columnAlias}"`;
                 }
 
                 if (index === this.selectField.length - 1) {
@@ -140,8 +143,14 @@ class QueryBuilder {
         }
 
         if (this.limit && this.offset) {
-            queryString += `LIMIT ${this.limit} `;
-            if (this.offset) queryString += `OFFSET ${this.offset} `;
+            if (this.datastore === 'postgresql') {
+                queryString += `LIMIT ${this.limit} `;
+                queryString += `OFFSET ${this.offset} `;
+            }
+            else if (this.datastore === 'sqlserver') {
+                queryString += `OFFSET ${this.offset} ROWS `;
+                queryString += `FETCH NEXT ${this.limit} ROWS ONLY `;
+            }
         }
 
         queryString = queryString.trim();
@@ -154,4 +163,4 @@ class QueryBuilder {
     }
 }
 
-module.exports = QueryBuilder;
+module.exports = QueryBuilder;