add order by default value

README.md

@@ -3,16 +3,16 @@ Simple ORM for nodejs, based on [sql-template-string](https://github.com/felixfb
 
 <!-- TOC -->
 - [Usage](#usage)
-  - [Connect to database](#usage-connection)
-    - [Connection](#usage-connection-get)
-    - [Migrations](#usage-migrations)
-    - [Model](#usage-model)
-        - [Definition](#usage-model-definition)
-        - [Usage](#usage-model-usage)
-    - [Helpers](#usage-helpers)
-- [Devlopment](#dev)
-    - [Installation](#dev-install)
-    - [Tests](#dev-tests)
+  - [Connect to database](#connect-to-database)
+    - [Connection](#connection)
+    - [Migrations](#migrations)
+    - [Model](#model)
+        - [Definition](#definition)
+        - [Usage](#usage-1)
+    - [Helpers](#helpers)
+- [Devlopment](#devlopment)
+    - [Installation](#tnstallation)
+    - [Tests](#tests)
 - [License](#license)
 
 <!-- TOC END -->
@@ -52,6 +52,7 @@ const model = vegeData.model.init({
     fields: ['id', 'name', 'status', ... ],
     table: <my table>,
     primaryKey: 'rowId' // by default
+    orderBy: 'rowId ASC' // by default
 })
 ```
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vege-data",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Simple SQLLite ORM for nodejs based on sql-template-strings and sqlite",
   "main": "./lib/index.js",
   "scripts": {

src/model/model.js

@@ -22,10 +22,10 @@ const makeQueries = ({ fields, table }) => {
   };
 };
 
-const makeGetter = ({ exec, queries, primaryKey }) => ({
+const makeGetter = ({ exec, queries, primaryKey, orderBy }) => ({
   all: () => exec(
     'all',
-    queries.select()
+    queries.select().append(orderBy)
   ),
   get: id => exec('get', queries.select()
     .append(' WHERE ' + primaryKey + '=')
@@ -36,6 +36,7 @@ const makeGetter = ({ exec, queries, primaryKey }) => ({
       .append(' WHERE ' + primaryKey + ' IN (')
       .append(concatValues(ids))
       .append(')')
+      .append(orderBy);
 
     return exec('all', query);
   },
@@ -44,6 +45,7 @@ const makeGetter = ({ exec, queries, primaryKey }) => ({
     queries.select()
       .append(' WHERE ' + field + ' =')
       .append(SQL`${value}`)
+      .append(orderBy)
   )
 });
 
@@ -74,6 +76,7 @@ const makeStore = ({ exec, queries, fields }) => {
  * @param {array} _.fields - fields list
  * @param {string} _.table - table name
  * @param {string} [_.primaryKey=rowId] primary key
+ * @param {string} [_.orderBy=rowId] primary key
  *
  * @return {object}
  */
@@ -82,14 +85,16 @@ const init = ({ connect, log }) => (config) => {
     fields,
     table,
     primaryKey = 'rowid',
+    orderBy = 'rowid'
   } = config;
   const exec = makeExec({ connect, log })
+  const defaultOrder = ` ORDER BY ${orderBy}`;
   const queries = makeQueries({ fields, table });
 
   return {
     config,
     queries,
-    ...makeGetter({ exec, queries, primaryKey }),
+    ...makeGetter({ exec, queries, primaryKey, orderBy: defaultOrder }),
     ...makeStore({ exec, queries, fields })
   };
 };

tests/features/model/getter/getter.test.js

@@ -63,8 +63,8 @@ describe('Model->getters', () => {
 
   describe('getAll', () => {
     const couple = [
-      { name: 'bulma', type: 'human' },
-      { name: 'vegeta', type:'sayan' }
+      { name: 'vegeta', type:'sayan' },
+      { name: 'bulma', type: 'human' }
     ];
 
     it('should return all asked ids', () => {
@@ -90,4 +90,33 @@ describe('Model->getters', () => {
       ]);
     });
   });
+
+  describe('orderBy, should sort answer for multiple response', () => {
+    describe.each([
+      'ASC',
+      'DESC'
+    ])('%s', (order) => {
+      let model
+      beforeAll(() => {
+        model = vegeData.model.init({
+          table: 'characters',
+          fields: ['name', 'type'],
+          orderBy: `name ${order}`,
+          primaryKey: 'name'
+        });
+      });
+
+      it.each([
+        ['all', '', []],
+        ['getAll', `WHERE name IN ('vegeta', 'goku')`, [['vegeta', 'goku']]],
+        ['findBy', `WHERE type = 'sayan'`, ['type','sayan']]
+      ])('%s', async (func, conds, args) => {
+        const wanted = await db.all(`SELECT name, type FROM characters ${conds} ORDER BY name ${order}`),
+
+        result = await model[func](...args);
+
+        expect(result).toEqual(wanted);
+      });
+    });
+  });
 });