chore(ci): Update build matrix (sequelize#5918)

* chore(ci): Update build matrix

* 🔥 Mariadb

* Remove 0.12 from build matrix

* Update .travis.yml

Author: janmeier

.gitignore

@@ -13,3 +13,4 @@ coverage-*
 site
 docs/api/tmp.md
 ssce.js
+coverage

.travis.yml

@@ -1,24 +1,36 @@
 language: node_js
 
-node_js:
-  - "0.10"
-  - "0.12"
-  - "iojs-v1"
-  - "iojs-v2"
-
 sudo: false
 
+node_js:
+  - "4"
+
 cache:
   directories:
     - node_modules
 
 env:
-  - DIALECT=mysql
-  - DIALECT=postgres
-  - DIALECT=postgres-native
-  - DIALECT=sqlite
-  - DIALECT=mariadb
-  - DIALECT=mssql
+  global:
+    - CC=clang
+    - CXX=clang++
+    - npm_config_clang=1
+    - COVERALLS_REPO_TOKEN=751SiA6QhY5EH4P2ygq7JFWulqiD2ETXO
+    - COVERALLS_PARALLEL=true
+  matrix:
+    - DIALECT=mysql
+    - DIALECT=postgres
+    - DIALECT=postgres-native
+    - DIALECT=sqlite
+    - DIALECT=mssql
+
+addons:
+  apt:
+    sources:
+      - llvm-toolchain-precise-3.6
+      - ubuntu-toolchain-r-test
+    packages:
+      - clang-3.6
+      - g++-4.8
 
 addons:
   postgresql: "9.4"
@@ -32,10 +44,17 @@ script:
   - "npm test"
 
 matrix:
-  fast_finish: true
   include:
-    - node_js: "0.10"
-      env: COVERAGE=true
-  allow_failures:
-    - node_js: "0.10"
-      env: COVERAGE=true
+    - node_js: "6"
+      env: COVERAGE=true DIALECT=mysql
+    - node_js: "6"
+      env: COVERAGE=true DIALECT=postgres
+    - node_js: "6"
+      env: COVERAGE=true DIALECT=postgres-native
+    - node_js: "6"
+      env: COVERAGE=true DIALECT=sqlite
+    - node_js: "6"
+      env: COVERAGE=true DIALECT=mssql
+
+notifications:
+  webhooks: https://coveralls.io/webhook?repo_token=$COVERALLS_REPO_TOKEN

CONTRIBUTING.md

@@ -131,7 +131,7 @@ All tests are located in the `test` folder (which contains the
 lovely [Mocha](http://visionmedia.github.io/mocha/) tests).
 
 ```console
-$ npm run test-all || test-mysql || test-sqlite || test-mssql || test-postgres || test-mariadb || test-postgres-native
+$ npm run test-all || test-mysql || test-sqlite || test-mssql || test-postgres || test-postgres-native
 
 $ # alternatively you can pass database credentials with $variables when testing
 $ DIALECT=dialect SEQ_DB=database SEQ_USER=user SEQ_PW=password npm test

Dockerfile

@@ -1,8 +1,9 @@
-FROM node:5
+FROM node:6
 
 RUN apt-get install libpq-dev
 
 COPY package.json /
+ENV NPM_CONFIG_LOGLEVEL error
 RUN npm install
 
 WORKDIR /sequelize

README.md

@@ -1,10 +1,11 @@
 # Sequelize
 
-[![Build Status](https://travis-ci.org/sequelize/sequelize.svg?branch=master)](https://travis-ci.org/sequelize/sequelize) [![Dependency Status](https://david-dm.org/sequelize/sequelize.svg)](https://david-dm.org/sequelize/sequelize) [![Test Coverage](https://codeclimate.com/github/sequelize/sequelize/badges/coverage.svg)](https://codeclimate.com/github/sequelize/sequelize)
+[![Build Status](https://travis-ci.org/sequelize/sequelize.svg?branch=master)](https://travis-ci.org/sequelize/sequelize)
+[![Coverage Status](https://coveralls.io/repos/github/sequelize/sequelize/badge.svg?branch=master)](https://coveralls.io/github/sequelize/sequelize?branch=master)
 [![Bountysource](https://www.bountysource.com/badge/team?team_id=955&style=bounties_received)](https://www.bountysource.com/teams/sequelize/issues?utm_source=Sequelize&utm_medium=shield&utm_campaign=bounties_received)
 [![Slack Status](http://sequelize-slack.herokuapp.com/badge.svg)](http://sequelize-slack.herokuapp.com)
 
-Sequelize is a promise-based Node.js/io.js ORM for Postgres, MySQL, MariaDB, SQLite and Microsoft SQL Server. It features solid transaction support, relations, read replication and more.
+Sequelize is a promise-based Node.js/io.js ORM for Postgres, MySQL, SQLite and Microsoft SQL Server. It features solid transaction support, relations, read replication and more.
 
 [Documentation](http://sequelize.readthedocs.org/en/latest/)
 

changelog.md

@@ -11,6 +11,7 @@
 - [REMOVED] Support for `pool:false`
 - [REMOVED] Default transaction isolation level [#5094](https://github.com/sequelize/sequelize/issues/5094)
 - [ADDED] Add logging for mysql warnings, observant of the `showWarnings` option. [#5900](https://github.com/sequelize/sequelize/issues/5900)
+- [REMOVED] MariaDB dialect
 
 ## BC breaks:
 - `hookValidate` removed in favor of `validate` with `hooks: true | false`. `validate` returns a promise which is rejected if validation fails
@@ -21,6 +22,7 @@
 - (MySQL) `BIGINT` now gets converted to string when number is too big
 - Removed support for `pool:false`, if you still want to use single connection set `pool.max` to `1`
 - Removed default `REPEATABLE_READ` transaction isolation, use config option to explicitly set it
+- Removed MariaDB dialect - this was just a thin wrapper around MySQL, so using `dialect: 'mysql'` instead should work with no further changes
 
 # 3.23.2
 - [FIXED] Type validation now works with non-strings due to updated validator@5.0.0 [#5861](https://github.com/sequelize/sequelize/pull/5861)

docs/api/model.md

@@ -671,7 +671,7 @@ To obtain Instances for the newly created values, you will need to query for the
 | [options.hooks=true] | Boolean | Run before / after bulk create hooks? |
 | [options.individualHooks=false] | Boolean | Run before / after create hooks for each individual Instance? BulkCreate hooks will still be run if options.hooks is true. |
 | [options.ignoreDuplicates=false] | Boolean | Ignore duplicate values for primary keys? (not supported by postgres) |
-| [options.updateOnDuplicate] | Array | Fields to update if row key already exists (on duplicate key update)? (only supported by mysql & mariadb). By default, all fields are updated. |
+| [options.updateOnDuplicate] | Array | Fields to update if row key already exists (on duplicate key update)? (only supported by mysql). By default, all fields are updated. |
 | [options.transaction] | Transaction | Transaction to run query under |
 | [options.logging=false] | Function | A function that gets executed while running the query to log the sql. |
 | [options.returning=false] | Boolean | Append RETURNING * to get back auto generated values (Postgres only) |
@@ -775,7 +775,7 @@ of affected rows, while the second element is the actual affected rows (only sup
 | [options.sideEffects=true] | Boolean | Whether or not to update the side effects of any virtual setters. |
 | [options.individualHooks=false] | Boolean | Run before / after update hooks?. If true, this will execute a SELECT followed by individual UPDATEs. A select is needed, because the row data needs to be passed to the hooks |
 | [options.returning=false] | Boolean | Return the affected rows (only for postgres) |
-| [options.limit] | Number | How many rows to update (only for mysql and mariadb) |
+| [options.limit] | Number | How many rows to update (only for mysql) |
 | [options.logging=false] | Function | A function that gets executed while running the query to log the sql. |
 | [options.benchmark=false] | Boolean | Print query execution time in milliseconds when logging SQL. |
 | [options.transaction] | Transaction | Transaction to run query under |
@@ -792,4 +792,4 @@ Run a describe query on the table. The result will be return to the listener as
 
 ***
 
-_This document is automatically generated based on source code comments. Please do not edit it directly, as your changes will be ignored. Please write on <a href="irc://irc.freenode.net/#sequelizejs">IRC</a>, open an issue or a create a pull request if you feel something can be improved. For help on how to write source code documentation see [JSDoc](http://usejsdoc.org) and [dox](https://github.com/tj/dox)_
+_This document is automatically generated based on source code comments. Please do not edit it directly, as your changes will be ignored. Please write on <a href="irc://irc.freenode.net/#sequelizejs">IRC</a>, open an issue or a create a pull request if you feel something can be improved. For help on how to write source code documentation see [JSDoc](http://usejsdoc.org) and [dox](https://github.com/tj/dox)_

docs/api/sequelize.md

@@ -45,7 +45,7 @@ var sequelize = new Sequelize('mysql://localhost:3306/database', {})
 | [username=null] | String | The username which is used to authenticate against the database. |
 | [password=null] | String | The password which is used to authenticate against the database. |
 | [options={}] | Object | An object with options. |
-| [options.dialect='mysql'] | String | The dialect of the database you are connecting to. One of mysql, postgres, sqlite, mariadb and mssql. |
+| [options.dialect='mysql'] | String | The dialect of the database you are connecting to. One of mysql, postgres, sqlite and mssql. |
 | [options.dialectModulePath=null] | String | If specified, load the dialect library from this path. For example, if you want to use pg.js instead of pg when connecting to a pg database, you should specify 'pg.js' here |
 | [options.dialectOptions] | Object | An object of additional options, which are passed directly to the connection library |
 | [options.storage] | String | Only used by sqlite. Defaults to ':memory:' |

docs/articles/getting-started.md

@@ -35,7 +35,6 @@ $ npm install --save sequelize
 $ npm install --save pg       # for postgres
 $ npm install --save mysql    # for mysql
 $ npm install --save sqlite3  # for sqlite
-$ npm install --save mariasql # for mariasql
 ```
 
 ## Connecting to the database
@@ -45,7 +44,7 @@ Open the created directory in your favorite text editor and add a new file calle
 ```js
 var Sequelize = require('sequelize')
   , sequelize = new Sequelize('database_name', 'username', 'password', {
-      dialect: "mysql", // or 'sqlite', 'postgres', 'mariadb', 'mssql'
+      dialect: "mysql", // or 'sqlite', 'postgres', 'mssql'
       port:    3306 // or 5432 (for postgres)
     });
 

docs/docs/getting-started.md

@@ -7,7 +7,7 @@ $ npm install --save 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 mysql
 $ npm install --save sqlite3
 $ npm install --save tedious // MSSQL
 ```
@@ -19,7 +19,7 @@ Sequelize will setup a connection pool on initialization so you should ideally o
 ```js
 var sequelize = new Sequelize('database', 'username', 'password', {
   host: 'localhost',
-  dialect: 'mysql'|'mariadb'|'sqlite'|'postgres'|'mssql',
+  dialect: 'mysql'|'sqlite'|'postgres'|'mssql',
 
   pool: {
     max: 5,