Correct handling of multiline constraints (#202)

salsita · Feb 21, 2018 · 7a73621 · 7a73621
1 parent 56ffbd5
commit 7a73621
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/operations/tables.js b/lib/operations/tables.js
@@ -1,8 +1,11 @@
 import _ from 'lodash';
 import { escapeValue, template, quote, applyType, applyTypeAdapters, comment } from '../utils';
 
-const formatLines = (lines, replace, separator = ',\n') =>
-  lines.join(separator).replace(/^/gm, replace);
+const formatLines = (lines, replace, separator = ',') =>
+  lines
+    .map(line => line.replace(/(?:\r\n|\r|\n)+/g, ' '))
+    .join(`${separator}\n`)
+    .replace(/^/gm, replace);
 
 const parseReferences = (options) => {
   const {
@@ -211,7 +214,7 @@ export const dropColumns = (tableName, columns, { ifExists, cascade } = {}) => {
     columns = _.keys(columns); // eslint-disable-line no-param-reassign
   }
   return template`ALTER TABLE "${tableName}"
-${formatLines(quote(columns), `  DROP ${ifExists ? ' IF EXISTS' : ''}`, `${cascade ? ' CASCADE' : ''},\n`)};`;
+${formatLines(quote(columns), `  DROP ${ifExists ? ' IF EXISTS' : ''}`, `${cascade ? ' CASCADE' : ''},`)};`;
 };
 
 export const addColumns = (typeShorthands) => {