removing sql-string

mvoorberg · Mar 31, 2019 · 05f7aa1 · 05f7aa1 · raythorn · May 14, 2019
1 parent ed6684f
commit 05f7aa1
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 113 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -5,7 +5,7 @@ var path = require('path');
 var mkdirp = require('mkdirp');
 var dialects = require('./dialects');
 var _ = require('lodash');
-var SqlString = require('./sql-string');
+var SqlString = require('../node_modules/sequelize/lib/sql-string');
 var tsHelper = require('./ts-helper');
 var CLIEngine = require('eslint').CLIEngine;
 

diff --git a/lib/sql-string.js b/lib/sql-string.js
diff --git a/lib/ts-helper.js b/lib/ts-helper.js
@@ -1,8 +1,6 @@
 // put in seperate file to keep main sequelize-auto clean
 'use strict';
-
-var Sequelize = require('sequelize');
-var _ = Sequelize.Utils._;
+const _ = require('lodash');
 
 function getModelFileStart(indentation, spaces, tableName) {
   var fileStart = "/* jshint indent: " + indentation + " */\n";

diff --git a/test/generate.test.js b/test/generate.test.js
@@ -99,7 +99,6 @@ describe(helpers.getTestDialectTeaser('sequelize-auto'), function() {
   describe('should be able to generate', function() {
     it('the model files.', function(done) {
       this.timeout(10000); // failing on Node 8 + 10 at 2000.
-      console.log('A------------');      
       try {
         const self = this;
         const db = self.sequelize.config.database;
@@ -150,14 +149,12 @@ describe(helpers.getTestDialectTeaser('sequelize-auto'), function() {
                 debug('mysql queryPos:', queryPos, 'query:', query);
                 expect(queryPos).to.be.at.above(-1);
               });
-              debug('***');
             }
           } catch (err) {
             console.log("Error checking stdout:", err);
             throw err;
           }
           done();
-          console.log('B------------');      
         });
       } catch (err) {
         console.log("Ack:", err);