feat: remove mysql bind (#1)

* feat: add mssql pg support

.autod.conf.js

@@ -1,17 +1,26 @@
-'ues strict';
+'use strict';
 
 module.exports = {
   write: true,
   prefix: '^',
-  devprefix: '^',
-  exclude: [
-    'test/fixtures',
+  test: [
+    'test',
+    'benchmark',
   ],
   devdep: [
+    'egg',
+    'egg-ci',
+    'egg-bin',
     'autod',
+    'eslint',
+    'eslint-config-egg',
+    'supertest',
+    'webstorm-disable-index',
   ],
-  keep: [
-  ],
-  semver: [
+  exclude: [
+    './test/fixtures',
+    './docs',
+    './coverage',
   ],
+  registry: 'https://r.cnpmjs.org',
 };

.eslintignore

@@ -1 +1,2 @@
 test/fixtures
+coverage

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,24 @@
+<!--
+Thank you for your pull request. Please review below requirements.
+Bug fixes and new features should include tests and possibly benchmarks.
+Contributors guide: https://github.com/eggjs/egg/blob/master/CONTRIBUTING.md
+
+感谢您贡献代码。请确认下列 checklist 的完成情况。
+Bug 修复和新功能必须包含测试，必要时请附上性能测试。
+Contributors guide: https://github.com/eggjs/egg/blob/master/CONTRIBUTING.md
+-->
+
+##### Checklist
+<!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->
+
+- [ ] `npm test` passes
+- [ ] tests and/or benchmarks are included
+- [ ] documentation is changed or added
+- [ ] commit message follows commit guidelines
+
+##### Affected core subsystem(s)
+<!-- Provide affected core subsystem(s). -->
+
+
+##### Description of change
+<!-- Provide a description of the change below this comment. -->

.gitignore

@@ -1,5 +1,8 @@
-logs/
+logs
 npm-debug.log
 node_modules/
 coverage/
-.idea/
+.idea/
+run
+.DS_Store
+*.swp

.travis.yml

@@ -1,11 +1,15 @@
 sudo: false
 language: node_js
 node_js:
-  - '4'
   - '6'
+  - '7'
 install:
   - npm i npminstall && npminstall
 script:
   - npm run ci
 after_script:
   - npminstall codecov && codecov
+services:
+  - mysql
+before_install:
+  - mysql -e 'CREATE DATABASE IF NOT EXISTS test;'

README.md

@@ -27,9 +27,15 @@ Egg's sequelize plugin.
 ## Install
 
 ```bash
-$ npm i egg-security
+$ npm i --save egg-sequelize
+
+# And one of the following:
+$ npm install --save pg pg-hstore
+$ npm install --save mysql # For both mysql and mariadb dialects
+$ npm install --save tedious # MSSQL
 ```
 
+
 ## Usage & configuration
 
 - `config.default.js`
@@ -40,15 +46,16 @@ exports.sequelize = {
   host: 'localhost',
   username: 'root',
   password: '',
-  database: 'test'
+  database: 'test',
+  dialect: 'mysql', // support: mysql, mariadb, postgres, mssql
 };
 ```
 
 More documents please refer to [Sequelize.js](http://sequelize.readthedocs.io/en/v3/)
 
 ## models
 
-Please set sequelize models under `app/models`
+Please set sequelize models under `app/model`
 
 ## Examples
 
@@ -74,7 +81,7 @@ module.exports = function (sequelize) {
 'use strict'
 
 module.exports = function* () {
-  this.body = yield this.models.test.find({
+  this.body = yield this.model.test.find({
     'name':'aaa'
   })
 }

agent.js

@@ -1,8 +1,6 @@
 'use strict';
 
-const loader = require('./lib/loader');
-
-module.exports = appOrAgent => {
-  const done = appOrAgent.readyCallback('agent_sequelize');
-  loader(appOrAgent, done);
+module.exports = agent => {
+  require('./lib/loader')(agent);
 };
+

app.js

@@ -1,8 +1,6 @@
 'use strict';
 
-const loader = require('./lib/loader');
-
-module.exports = appOrAgent => {
-  const done = appOrAgent.readyCallback('worker_sequelize');
-  loader(appOrAgent, done);
+module.exports = app => {
+  require('./lib/loader')(app);
 };
+

app/extend/context.js

@@ -0,0 +1,6 @@
+'use strict';
+module.exports = {
+  get model() {
+    return this.app.sequelize.models;
+  },
+};

appveyor.yml

@@ -1,7 +1,7 @@
 environment:
   matrix:
-    - nodejs_version: '4'
     - nodejs_version: '6'
+    - nodejs_version: '7'
 
 install:
   - ps: Install-Product node $env:nodejs_version

config/config.default.js

@@ -2,4 +2,5 @@
 
 exports.sequelize = {
   modelPath: 'model',
+  dialect: 'mysql',
 };

lib/loader.js

@@ -4,29 +4,34 @@ const loading = require('loading');
 const path = require('path');
 const Sequelize = require('sequelize');
 
-module.exports = (app, done) => {
+module.exports = app => {
   app.config.sequelize.logging = function(str) {
     app.logger.info(`[egg-sequelize] ${str}`);
   };
+  const config = app.config.sequelize;
 
   const sequelize = new Sequelize(
-    `mysql://${app.config.sequelize.username}:${app.config.sequelize.password}@${app.config.sequelize.host}:${app.config.sequelize.port || 3306}/${app.config.sequelize.database}`,
-    app.config.sequelize);
-
-  sequelize.authenticate().then(() => {
-    sequelize.Sequelize = Sequelize;
-
-    loading(`${path.join(app.baseDir, 'app', app.config.sequelize.modelPath)}`).into(sequelize, 'models');
+    config.database,
+    config.username,
+    config.password,
+    {
+      host: config.host,
+      port: config.port,
+      dialect: config.dialect,
+      logging: config.logging,
+    }
+  );
+
+  app.sequelize = sequelize;
+  app.beforeStart(function* () {
+    yield app.sequelize.authenticate();
+    loading(`${path.join(app.baseDir, 'app', config.modelPath)}`).into(sequelize, 'models');
 
     Object.keys(sequelize.models).forEach(className => {
       if ('associate' in sequelize.models[className]) {
         sequelize.models[className].associate(sequelize.models);
       }
     });
-
-    app.sequelize = sequelize;
-    app.context.models = sequelize.models;
-
-    done();
-  }).catch(done);
+    app.logger.info('[egg-sequelize] start success');
+  });
 };

package.json

@@ -5,65 +5,55 @@
   "eggPlugin": {
     "name": "sequelize"
   },
-  "repository": {
-    "type": "git",
-    "url": "[email protected]:eggjs/egg-sequelize.git"
-  },
   "keywords": [
     "egg",
     "sequelize",
     "egg-plugin",
-    "mysql"
+    "eggPlugin",
+    "orm"
   ],
   "dependencies": {
     "loading": "^1.13.0",
-    "mysql": "^2.12.0",
-    "sequelize": "^3.27.0"
+    "sequelize": "^3.30.1"
   },
- "devDependencies": {
+  "devDependencies": {
     "autod": "^2.7.1",
-    "beautify-benchmark": "^0.2.4",
-    "benchmark": "^2.1.1",
-    "egg": "~0.1.0",
-    "egg-bin": "1",
-    "egg-ci": "1",
-    "egg-mock": "^0.0.4",
-    "egg-view-nunjucks": "~0.3.0",
-    "eslint": "3",
-    "eslint-config-egg": "3",
-    "pedding": "^1.0.0",
-    "rimraf": "^2.5.2",
-    "should": "^11.1.0",
-    "should-http": "^0.0.4",
-    "spy": "0",
-    "supertest": "^2.0.0"
+    "egg": "^0.10.0",
+    "egg-bin": "^2.0.2",
+    "egg-ci": "^1.1.0",
+    "egg-mock": "^2.3.1",
+    "eslint": "^3.15.0",
+    "eslint-config-egg": "^3.2.0",
+    "mysql": "^2.12.0",
+    "should": "^11.2.0",
+    "supertest": "^3.0.0",
+    "webstorm-disable-index": "^1.1.2"
   },
   "engines": {
-    "node": ">=4.0.0"
+    "node": ">=6.0.0"
   },
   "scripts": {
-    "test": "npm run lint && npm run test-local",
+    "test": "npm run lint -- --fix && npm run test-local",
     "test-local": "egg-bin test",
     "cov": "egg-bin cov",
-    "lint": "eslint --ext js . --fix",
+    "lint": "eslint .",
     "ci": "npm run lint && npm run cov",
     "autod": "autod"
   },
+  "files": [
+    "app.js",
+    "agent.js",
+    "config",
+    "app",
+    "lib"
+  ],
   "ci": {
-    "version": "4, 6"
+    "version": "6, 7"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/eggjs/egg-sequelize.git"
   },
-  "files": [
-    "agent.js",
-    "app",
-    "lib",
-    "config",
-    "app.js",
-    "index.js"
-  ],
   "bugs": {
     "url": "https://github.com/eggjs/egg/issues"
   },

test/fixtures/apps/model-app/app/model/test.js

@@ -0,0 +1,9 @@
+'use strict';
+
+module.exports = sequelize => {
+  return sequelize.define('test', {
+    name: {
+      type: sequelize.Sequelize.STRING(30),
+    }
+  })
+};

test/fixtures/apps/model-app/app/router.js

@@ -1,7 +1,5 @@
 'use strict';
 
-require('should');
-
 module.exports = function(app) {
   app.get('/models', function*() {
       //

test/fixtures/apps/model-app/config/config.js

@@ -2,4 +2,10 @@
 
 exports.sequelize = {
   modelPath: 'model',
+  port: '3306',
+  host: 'localhost',
+  username: 'root',
+  password: '',
+  database: 'test',
+  dialect: 'mysql',
 };

test/plugin.test.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const mm = require('egg-mock');
+require('should');
 
 describe('test/plugin.test.js', () => {
   let app;
@@ -15,8 +16,26 @@ describe('test/plugin.test.js', () => {
 
   after(mm.restore);
 
-  it('should load models into contxt', () => {
-    //
+  it('test config', function() {
+    const config = app.config.sequelize;
+    config.should.have.properties([
+      'modelPath',
+      'port',
+      'host',
+      'username',
+      'password',
+      'database',
+      'dialect',
+      'logging',
+    ]);
   });
+
+  it('sequelize init success', function() {
+    const sequelize = app.sequelize;
+    sequelize.should.be.ok;
+    sequelize.should.have.propertyByPath('models', 'test');
+  });
+
+
 });