Drop mariadb support (#2681)

* Dropped support for mariasql

* ESLint

package.json

@@ -39,7 +39,6 @@
     "estraverse": "^4.2.0",
     "istanbul": "^0.4.5",
     "json-loader": "^0.5.7",
-    "mariasql": "^0.2.6",
     "mocha": "^3.5.3",
     "mock-fs": "^4.4.2",
     "mssql": "^4.1.0",
@@ -101,7 +100,6 @@
     "query",
     "postgresql",
     "mysql",
-    "mariadb",
     "sqlite3",
     "oracle",
     "mssql"
@@ -117,7 +115,6 @@
     "mssql": false,
     "mysql": false,
     "mysql2": false,
-    "mariasql": false,
     "pg": false,
     "pg-query-stream": false,
     "oracle": false,

src/index.js

@@ -9,8 +9,6 @@ import { assign } from 'lodash'
 
 // The client names we'll allow in the `{name: lib}` pairing.
 const aliases = {
-  'mariadb' : 'maria',
-  'mariasql' : 'maria',
   'pg' : 'postgres',
   'postgresql' : 'postgres',
   'sqlite' : 'sqlite3'

src/util/parse-connection.js

@@ -5,9 +5,6 @@ import { parse as parsePG } from 'pg-connection-string'
 export default function parseConnectionString(str) {
   const parsed = url.parse(str)
   let { protocol } = parsed
-  if (protocol && protocol.indexOf('maria') === 0) {
-    protocol = 'maria'
-  }
   if (protocol === null) {
     return {
       client: 'sqlite3',
@@ -34,11 +31,9 @@ function connectionObject(parsed) {
   if (db[0] === '/') {
     db = db.slice(1)
   }
-  if (parsed.protocol.indexOf('maria') === 0) {
-    connection.db = db
-  } else {
-    connection.database = db
-  }
+
+  connection.database = db
+
   if (parsed.hostname) {
     if (parsed.protocol.indexOf('mssql') === 0) {
       connection.server = parsed.hostname;

test/index.js

@@ -22,7 +22,6 @@ describe('Query Building Tests', function() {
 
   require('./unit/query/builder')
   require('./unit/schema/mysql')('mysql')
-  require('./unit/schema/mysql')('maria')
   require('./unit/schema/mysql')('mysql2')
   require('./unit/schema/postgres')
   require('./unit/schema/redshift')

test/integration/builder/additional.js

@@ -250,7 +250,6 @@ module.exports = function(knex) {
       var tables = {
         mysql: 'SHOW TABLES',
         mysql2: 'SHOW TABLES',
-        mariadb: 'SHOW TABLES',
         postgresql: "SELECT table_name FROM information_schema.tables WHERE table_schema='public'",
         redshift: "SELECT table_name FROM information_schema.tables WHERE table_schema='public'",
         sqlite3: "SELECT name FROM sqlite_master WHERE type='table';",
@@ -536,9 +535,6 @@ module.exports = function(knex) {
         'mysql2': function() {
           return knex.raw('SELECT SLEEP(1)');
         },
-        mariadb: function() {
-          return knex.raw('SELECT SLEEP(1)');
-        },
         mssql: function() {
           return knex.raw('WAITFOR DELAY \'00:00:01\'');
         },
@@ -587,9 +583,6 @@ module.exports = function(knex) {
         'mysql2': function() {
           return knex.raw('SELECT SLEEP(10)');
         },
-        mariadb: function() {
-          return knex.raw('SELECT SLEEP(10)');
-        },
         mssql: function() {
           return knex.raw('WAITFOR DELAY \'00:00:10\'');
         },
@@ -608,8 +601,8 @@ module.exports = function(knex) {
         return query.timeout(200, {cancel: true});
       }
 
-      // Only mysql/mariadb query cancelling supported for now
-      if (!_.startsWith(dialect, "mysql") && !_.startsWith(dialect, "maria")) {
+      // Only mysql query cancelling supported for now
+      if (!_.startsWith(dialect, "mysql")) {
         expect(addTimeout).to.throw("Query cancelling not supported for this dialect");
         return;
       }
@@ -643,9 +636,9 @@ module.exports = function(knex) {
 
 
     it('.timeout(ms, {cancel: true}) should throw error if cancellation cannot acquire connection', function() {
-      // Only mysql/mariadb query cancelling supported for now
+      // Only mysql query cancelling supported for now
       var dialect = knex.client.config.dialect;
-      if (!_.startsWith(dialect, "mysql") && !_.startsWith(dialect, "maria")) {
+      if (!_.startsWith(dialect, "mysql")) {
         return;
       }
 

test/integration/migrate/index.js

@@ -330,7 +330,7 @@ module.exports = function(knex) {
           // MySQL / Oracle commit transactions implicit for most common
           // migration statements (e.g. CREATE TABLE, ALTER TABLE, DROP TABLE),
           // so we need to check for dialect
-          if (knex.client.dialect === 'mysql' || knex.client.dialect === 'mariadb' || knex.client.dialect === 'oracle') {
+          if (knex.client.dialect === 'mysql' || knex.client.dialect === 'oracle') {
             expect(exists).to.equal(true);
           } else {
             expect(exists).to.equal(false);

test/integration/schema/index.js

@@ -124,8 +124,8 @@ module.exports = function(knex) {
           });
       });
 
-      describe('increments types - mysql/maria', function() {
-        if(!knex || !knex.client || (!(/mysql/i.test(knex.client.dialect)) && !(/maria/i.test(knex.client.dialect)))) {
+      describe('increments types - mysql', function() {
+        if(!knex || !knex.client || (!(/mysql/i.test(knex.client.dialect)))) {
           return Promise.resolve();
         }
 
@@ -695,7 +695,7 @@ module.exports = function(knex) {
       describe('mysql only', function() {
         if (!knex ||
             !knex.client ||
-            (!(/mysql/i.test(knex.client.dialect)) && !(/maria/i.test(knex.client.dialect)))
+            (!(/mysql/i.test(knex.client.dialect)))
         ) {
           return Promise.resolve();
         }