Enforce Unix (lf) line terminators (#3598)

knex · Dec 29, 2019 · 4feefdf · 4feefdf
1 parent a2a6660
commit 4feefdf
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 50 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -1,5 +1,6 @@
 {
   "singleQuote": true,
   "trailingComma": "es5",
-  "arrowParens": "always"
-}
+  "arrowParens": "always",
+  "endOfLine": "lf"
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Master (Unreleased)
 
+# 0.20.6 - 29 December, 2019
+
+### Bug fixes:
+
+- Enforce Unix (lf) line terminators #3598
+
 # 0.20.5 - 29 December, 2019
 
 ### New features:

diff --git a/lib/client.js b/lib/client.js
@@ -30,7 +30,7 @@ const debug = require('debug')('knex:client');
 const _debugQuery = require('debug')('knex:query');
 const debugBindings = require('debug')('knex:bindings');
 
-const debugQuery = (sql, txId) => _debugQuery(sql.replace(/%/g, '%%'), txId)
+const debugQuery = (sql, txId) => _debugQuery(sql.replace(/%/g, '%%'), txId);
 
 const { POOL_CONFIG_OPTIONS } = require('./constants');
 

diff --git a/lib/dialects/postgres/query/compiler.js b/lib/dialects/postgres/query/compiler.js
@@ -160,7 +160,7 @@ Object.assign(QueryCompiler_PG.prototype, {
 
   distinctOn(value) {
     return 'distinct on (' + this.formatter.columnize(value) + ') ';
-  }
+  },
 });
 
 module.exports = QueryCompiler_PG;
diff --git a/lib/query/builder.js b/lib/query/builder.js
@@ -201,7 +201,7 @@ assign(Builder.prototype, {
     this._statements.push({
       grouping: 'columns',
       value,
-      distinctOn: true
+      distinctOn: true,
     });
     return this;
   },

diff --git a/lib/schema/tablebuilder.js b/lib/schema/tablebuilder.js
@@ -77,12 +77,14 @@ each(specialMethods, function(methods, dialect) {
   each(methods, function(method) {
     TableBuilder.prototype[method] = function(value) {
       if (this.client.dialect !== dialect) {
-        throw new Error(`Knex only supports ${method} statement with ${dialect}.`);
+        throw new Error(
+          `Knex only supports ${method} statement with ${dialect}.`
+        );
       }
       if (this._method === 'alter') {
         throw new Error(
           `Knex does not support altering the ${method} outside of create ` +
-          `table, please use knex.raw statement.`
+            `table, please use knex.raw statement.`
         );
       }
       this._single[method] = value;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "knex",
-  "version": "0.20.5",
+  "version": "0.20.6",
   "description": "A batteries-included SQL query & schema builder for Postgres, MySQL and SQLite3 and the Browser",
   "main": "knex.js",
   "types": "types/index.d.ts",

diff --git a/test/integration/builder/selects.js b/test/integration/builder/selects.js
@@ -794,43 +794,44 @@ module.exports = function(knex) {
         } catch (e) {
           error = e;
         }
-        expect(error.message).to.eql('.distinctOn() is currently only supported on PostgreSQL');
+        expect(error.message).to.eql(
+          '.distinctOn() is currently only supported on PostgreSQL'
+        );
         return;
-      } 
-      return builder
-        .testSql(function(tester) {
-          tester(
-            'pg',
-            'select distinct on ("id") "email", "logins" from "accounts" order by "id" asc',
-            [],
-            [
-              {
-                email: 'test@example.com',
-                logins: 1,
-              },
-              {
-                email: 'test2@example.com',
-                logins: 1,
-              },
-              {
-                email: 'test3@example.com',
-                logins: 2,
-              },
-              {
-                email: 'test4@example.com',
-                logins: 2,
-              },
-              {
-                email: 'test5@example.com',
-                logins: 2,
-              },
-              {
-                email: 'test6@example.com',
-                logins: 2,
-              },
-            ]
-          );
-        });
+      }
+      return builder.testSql(function(tester) {
+        tester(
+          'pg',
+          'select distinct on ("id") "email", "logins" from "accounts" order by "id" asc',
+          [],
+          [
+            {
+              email: 'test@example.com',
+              logins: 1,
+            },
+            {
+              email: 'test2@example.com',
+              logins: 1,
+            },
+            {
+              email: 'test3@example.com',
+              logins: 2,
+            },
+            {
+              email: 'test4@example.com',
+              logins: 2,
+            },
+            {
+              email: 'test5@example.com',
+              logins: 2,
+            },
+            {
+              email: 'test6@example.com',
+              logins: 2,
+            },
+          ]
+        );
+      });
     });
 
     it('does "orWhere" cases', function() {

diff --git a/test/unit/schema/mssql.js b/test/unit/schema/mssql.js
@@ -11,12 +11,15 @@ describe('MSSQL SchemaBuilder', function() {
 
   it('throws when charset and collate are specified', function() {
     expect(() => {
-      tableSql = client.schemaBuilder().createTable('users', function(table) {
-        table.increments('id');
-        table.string('email');
-        table.charset('utf8');
-        table.collate('utf8_unicode_ci');
-      }).toSQL();
+      tableSql = client
+        .schemaBuilder()
+        .createTable('users', function(table) {
+          table.increments('id');
+          table.string('email');
+          table.charset('utf8');
+          table.collate('utf8_unicode_ci');
+        })
+        .toSQL();
     }).to.throw('Knex only supports charset statement with mysql');
   });