Merge pull request #49 from ezweb/pg10

rewrite

.gitignore

@@ -0,0 +1,4 @@
+bin/
+vendor/
+.idea/
+/composer.lock

.travis.yml

@@ -1,32 +1,17 @@
-language: php
+language: ruby
 
-php:
-    - "7.1"
+env:
+    - DOCKER_COMPOSE_VERSION=1.22.0
 
-addons:
-    postgresql: "9.6"
+before_install:
+    - sudo rm /usr/local/bin/docker-compose
+    - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+    - chmod +x docker-compose
+    - sudo mv docker-compose /usr/local/bin
 
-before_script:
-    - phpenv config-add config/docker/php/behat/apc.ini
-    - composer install
-    - psql -c "create role admin login createdb password 'adminpassword' superuser ;" -U postgres
-    - psql -c "create role behat login createdb password 'behatpassword';" -U postgres
-    - psql -c 'create database behat OWNER=behat;' -U postgres
-    - psql -c 'create database dblinker_test OWNER=behat;' -U postgres
-    - psql -c 'create database forbidden_db;'
-    - mysql -e 'create database dblinker_test;'
-    - mysql -e 'create database forbidden_db;'
-    - mysql -e 'CREATE USER "behat"@"localhost" IDENTIFIED BY "behatpassword";'
-    - mysql -u root -e 'GRANT ALL PRIVILEGES ON dblinker_test.* TO "behat"@"localhost";'
-    - mysql -u root -e 'FLUSH PRIVILEGES;'
+services:
+    - docker
 
 script:
-    - vendor/bin/behat -s $BEHAT_DB_DRIVER --tags $SKIP_TAGS
-
-env:
-    - BEHAT_DB_DRIVER=mysqli SKIP_TAGS="~@skip-travis&&~@skip-travis-mysqli" DBLINKER_MYSQL_1_ENV_MYSQL_DATABASE=dblinker_test DBLINKER_MYSQL_1_PORT_3306_TCP_ADDR=127.0.0.1 DBLINKER_MYSQL_1_ENV_MYSQL_USER=behat DBLINKER_MYSQL_1_ENV_MYSQL_PASSWORD=behatpassword DBLINKER_MYSQL_1_ENV_MYSQL_ROOT_PASSWORD=
-    - BEHAT_DB_DRIVER=pdo_mysql SKIP_TAGS="~@skip-travis&&~@skip-travis-pdo-mysql" DBLINKER_MYSQL_1_ENV_MYSQL_DATABASE=dblinker_test DBLINKER_MYSQL_1_PORT_3306_TCP_ADDR=127.0.0.1 DBLINKER_MYSQL_1_ENV_MYSQL_USER=behat DBLINKER_MYSQL_1_ENV_MYSQL_PASSWORD=behatpassword DBLINKER_MYSQL_1_ENV_MYSQL_ROOT_PASSWORD=
-    - BEHAT_DB_DRIVER=pdo_pgsql SKIP_TAGS="~@skip-travis&&~@skip-travis-pdo-pgsql" DBLINKER_POSTGRESQL_1_ENV_POSTGRES_DATABASE=dblinker_test DBLINKER_POSTGRESQL_1_PORT_5432_TCP_ADDR=127.0.0.1 DBLINKER_POSTGRESQL_1_ENV_POSTGRES_USER=behat DBLINKER_POSTGRESQL_1_ENV_POSTGRES_PASSWORD=behatpassword DBLINKER_POSTGRES_1_ENV_POSTGRES_ROOT_USER=admin DBLINKER_POSTGRES_1_ENV_POSTGRES_ROOT_PASSWORD=adminpassword
-
-matrix:
-    fast_finish: true
+    - docker-compose run composer install
+    - docker-compose run --rm behat --tags "~@skip-travis&&~@skip-travis-pdo-pgsql&&~@skip-travis-mysqli"

README.md

@@ -89,4 +89,5 @@ Note: You can nest a `MysqlMasterSlavesConnection` in a `MysqlRetryConnection`.
 
 To run the test suite, you need Docker & Docker-Compose:
 
+    docker-compose run composer install
     docker-compose run behat

behat.yml

@@ -13,8 +13,4 @@ default:
         pdo_pgsql:
             contexts: [ PdoPgsqlContext ]
             filters:
-                tags: ~@skip-pdo-pgsql
-        mysqlreplic:
-            contexts: [ MysqlReplicContext ]
-            filters:
-                tags: ~@skip-mysql-replic
+                tags: ~@skip-pdo-pgsql

composer.json

@@ -17,8 +17,8 @@
         }
     },
     "require": {
-        "php": "^7",
-        "doctrine/dbal": "^2.5.2",
+        "php": "^7.1",
+        "doctrine/dbal": "^2.8",
         "psr/cache": "^1.0",
         "cache/apcu-adapter": "^1.0"
     },

config/docker/db/init-mysql-master.sql

@@ -0,0 +1,9 @@
+CREATE TABLE db.`users` (
+  `name` varchar(50) NULL,
+  `email` varchar(128) NOT NULL
+);
+
+INSERT INTO db.`users` (name, email) VALUES
+                                           ('John', '[email protected]'),
+                                           ('Roger', '[email protected]'),
+                                           ('Max', '[email protected]');

config/docker/db/init-mysql-slave.sql

@@ -0,0 +1,14 @@
+CREATE TABLE db.`users` (
+  `name` varchar(50) NULL,
+  `email` varchar(128) NOT NULL
+);
+
+INSERT INTO db.`users` (name, email) VALUES
+                         ('John', '[email protected]'),
+                         ('Roger', '[email protected]'),
+                         ('Max', '[email protected]');
+
+REVOKE ALL ON db.* FROM 'slave_user'@'%';
+GRANT SELECT ON *.* TO 'slave_user'@'%';
+
+FLUSH PRIVILEGES ;

config/docker/db/init-pgsql-master.sql

@@ -0,0 +1,9 @@
+CREATE TABLE users (
+   name varchar(50) NULL,
+   email varchar(128) NOT NULL
+);
+
+INSERT INTO users (name, email) VALUES
+                                           ('John', '[email protected]'),
+                                           ('Roger', '[email protected]'),
+                                           ('Max', '[email protected]');

config/docker/db/init-pgsql-slave.sql

@@ -0,0 +1,12 @@
+CREATE TABLE users (
+                         name varchar(50) NULL,
+                         email varchar(128) NOT NULL
+);
+
+INSERT INTO users (name, email) VALUES
+('John', '[email protected]'),
+('Roger', '[email protected]'),
+('Max', '[email protected]');
+
+REVOKE ALL ON users FROM slave_user;
+GRANT SELECT ON users TO slave_user;

config/docker/db/my.cnf

@@ -0,0 +1,2 @@
+[mysqld]
+max_user_connections=8

config/docker/php/composer/Dockerfile

@@ -1,13 +1,9 @@
-FROM php:7.1
+FROM php:7.1-fpm-alpine
 
-RUN apt-get update
-RUN apt-get install -y zlib1g-dev
-RUN docker-php-ext-install zip
+RUN docker-php-ext-install mbstring
 
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir /usr/local/bin --filename composer
 
-RUN docker-php-ext-install mbstring
-
 ENTRYPOINT ["/usr/local/bin/composer"]
 
 WORKDIR /scripts

config/docker/php/vendor/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.1-fpm
+FROM php:7.1-fpm-alpine
 
 VOLUME /scripts/vendor/
 

docker-compose.yml

@@ -2,7 +2,7 @@ composer:
     build: config/docker/php/composer
     volumes:
         - ./composer.json:/scripts/composer.json:rw
-        - ./composer.lock:/scripts/composer.lock:rw
+#        - ./composer.lock:/scripts/composer.lock:rw
         - ./bin:/scripts/bin:rw
     volumes_from:
         - vendor
@@ -19,19 +19,95 @@ behat:
     volumes_from:
         - vendor
     links:
-        - mysql
-        - postgresql
-mysql:
+        - mysql_master
+        - mysql_slave_1
+        - mysql_slave_2
+        - mysql_slave_3
+        - postgresql_master
+        - postgresql_slave_1
+        - postgresql_slave_2
+        - postgresql_slave_3
+
+mysql_master:
     image: mariadb:10.2
+    volumes:
+        - ./config/docker/db/my.cnf:/etc/mysql/conf.d/docker.cnf
+        - ./config/docker/db/init-mysql-master.sql:/docker-entrypoint-initdb.d/init.sql:ro
+    environment:
+        MYSQL_DATABASE: db
+        MYSQL_USER: master_user
+        MYSQL_PASSWORD: password
+        MYSQL_ROOT_PASSWORD: rootpassword
+
+mysql_slave_1:
+    image: mariadb:10.2
+    volumes:
+        - ./config/docker/db/my.cnf:/etc/mysql/conf.d/docker.cnf
+        - ./config/docker/db/init-mysql-slave.sql:/docker-entrypoint-initdb.d/init.sql:ro
+    environment:
+        MYSQL_DATABASE: db
+        MYSQL_USER: slave_user
+        MYSQL_PASSWORD: password
+        MYSQL_ROOT_PASSWORD: rootpassword
+
+mysql_slave_2:
+    image: mariadb:10.2
+    volumes:
+        - ./config/docker/db/my.cnf:/etc/mysql/conf.d/docker.cnf
+        - ./config/docker/db/init-mysql-slave.sql:/docker-entrypoint-initdb.d/init.sql:ro
     environment:
         MYSQL_DATABASE: db
-        MYSQL_USER: user
+        MYSQL_USER: slave_user
         MYSQL_PASSWORD: password
         MYSQL_ROOT_PASSWORD: rootpassword
-postgresql:
-    image: postgres:9.6
+
+mysql_slave_3:
+    image: mariadb:10.2
+    volumes:
+        - ./config/docker/db/my.cnf:/etc/mysql/conf.d/docker.cnf
+        - ./config/docker/db/init-mysql-slave.sql:/docker-entrypoint-initdb.d/init.sql:ro
     environment:
-        POSTGRES_DATABASE: db
-        POSTGRES_USER: user
+        MYSQL_DATABASE: db
+        MYSQL_USER: slave_user
+        MYSQL_PASSWORD: password
+        MYSQL_ROOT_PASSWORD: rootpassword
+
+postgresql_master:
+    image: postgres:10
+    volumes:
+        - ./config/docker/db/init-pgsql-master.sql:/docker-entrypoint-initdb.d/init.sql:ro
+    environment:
+        POSTGRES_DB: db
+        POSTGRES_USER: master_user
+        POSTGRES_PASSWORD: password
+        POSTGRES_ROOT_PASSWORD: password
+
+postgresql_slave_1:
+    image: postgres:10
+    volumes:
+        - ./config/docker/db/init-pgsql-slave.sql:/docker-entrypoint-initdb.d/init.sql:ro
+    environment:
+        POSTGRES_DB: db
+        POSTGRES_USER: slave_user
         POSTGRES_PASSWORD: password
         POSTGRES_ROOT_PASSWORD: password
+
+postgresql_slave_2:
+    image: postgres:10
+    volumes:
+        - ./config/docker/db/init-pgsql-slave.sql:/docker-entrypoint-initdb.d/init.sql:ro
+    environment:
+        POSTGRES_DB: db
+        POSTGRES_USER: slave_user
+        POSTGRES_PASSWORD: password
+        POSTGRES_ROOT_PASSWORD: password
+
+postgresql_slave_3:
+    image: postgres:10
+    volumes:
+        - ./config/docker/db/init-pgsql-slave.sql:/docker-entrypoint-initdb.d/init.sql:ro
+    environment:
+        POSTGRES_DB: db
+        POSTGRES_USER: slave_user
+        POSTGRES_PASSWORD: password
+        POSTGRES_ROOT_PASSWORD: password