chores: postgres-10 (#9899)

.travis.yml

@@ -21,13 +21,13 @@ env:
     - SEQ_MYSQL_USER=sequelize_test
     - SEQ_MYSQL_USER=sequelize_test
     - SEQ_MYSQL_PW=sequelize_test
     - SEQ_MYSQL_PW=sequelize_test
     - SEQ_MYSQL_HOST=127.0.0.1
     - SEQ_MYSQL_HOST=127.0.0.1
-    - SEQ_MYSQL_PORT=8999
+    - SEQ_MYSQL_PORT=8980
     # postgres info
     # postgres info
     - SEQ_PG_DB=sequelize_test
     - SEQ_PG_DB=sequelize_test
     - SEQ_PG_USER=sequelize_test
     - SEQ_PG_USER=sequelize_test
     - SEQ_PG_PW=sequelize_test
     - SEQ_PG_PW=sequelize_test
     - SEQ_PG_HOST=127.0.0.1
     - SEQ_PG_HOST=127.0.0.1
-    - SEQ_PG_PORT=8998
+    - SEQ_PG_PORT=8990
 
 
 before_script:
 before_script:
   # mount ramdisk
   # mount ramdisk
@@ -57,6 +57,10 @@ jobs:
     - stage: test
     - stage: test
       node_js: '6'
       node_js: '6'
       sudo: required
       sudo: required
+      env: POSTGRES_VER=postgres-10 SEQ_PG_PORT=8991 DIALECT=postgres COVERAGE=true
+    - stage: test
+      node_js: '6'
+      sudo: required
       env: POSTGRES_VER=postgres-95 DIALECT=postgres COVERAGE=true
       env: POSTGRES_VER=postgres-95 DIALECT=postgres COVERAGE=true
     - stage: test
     - stage: test
       node_js: '6'
       node_js: '6'

docker-compose.yml

@@ -6,6 +6,7 @@ services:
     links:
     links:
      - mysql-57
      - mysql-57
      - postgres-95
      - postgres-95
+     - postgres-10
     volumes:
     volumes:
       - .:/sequelize
       - .:/sequelize
     environment:
     environment:
@@ -21,11 +22,23 @@ services:
       POSTGRES_PASSWORD: sequelize_test
       POSTGRES_PASSWORD: sequelize_test
       POSTGRES_DB: sequelize_test
       POSTGRES_DB: sequelize_test
     volumes:
     volumes:
-      - /mnt/sequelize-postgres-ramdisk:/var/lib/postgresql/data
+      - /mnt/sequelize-postgres-95-ramdisk:/var/lib/postgresql/data
     ports:
     ports:
-      - "8998:5432"
+      - "8990:5432"
     container_name: postgres-95
     container_name: postgres-95
 
 
+  postgres-10:
+    image: sushantdhiman/postgres:10
+    environment:
+      POSTGRES_USER: sequelize_test
+      POSTGRES_PASSWORD: sequelize_test
+      POSTGRES_DB: sequelize_test
+    volumes:
+      - /mnt/sequelize-postgres-10-ramdisk:/var/lib/postgresql/data
+    ports:
+      - "8991:5432"
+    container_name: postgres-10
+
   # MySQL
   # MySQL
   mysql-57:
   mysql-57:
     image: mysql:5.7
     image: mysql:5.7
@@ -35,9 +48,9 @@ services:
       MYSQL_USER: sequelize_test
       MYSQL_USER: sequelize_test
       MYSQL_PASSWORD: sequelize_test
       MYSQL_PASSWORD: sequelize_test
     volumes:
     volumes:
-      - /mnt/sequelize-mysql-ramdisk:/var/lib/mysql
+      - /mnt/sequelize-mysql-57-ramdisk:/var/lib/mysql
     ports:
     ports:
-      - "8999:3306"
+      - "8980:3306"
     container_name: mysql-57
     container_name: mysql-57
 
 
   # MSSQL
   # MSSQL
@@ -47,6 +60,6 @@ services:
       ACCEPT_EULA: "Y"
       ACCEPT_EULA: "Y"
       SA_PASSWORD: yourStrong(!)Password
       SA_PASSWORD: yourStrong(!)Password
     ports:
     ports:
-      - "8997:1433"
+      - "8970:1433"
     container_name: mssql
     container_name: mssql
 
 

test/config/.docker.env

 # Special ports needed for docker to prevent port conflicts
 # Special ports needed for docker to prevent port conflicts
-SEQ_MYSQL_PORT=8999
+SEQ_MYSQL_PORT=8980
 SEQ_MYSQL_USER=sequelize_test
 SEQ_MYSQL_USER=sequelize_test
 SEQ_MYSQL_PW=sequelize_test
 SEQ_MYSQL_PW=sequelize_test
-SEQ_PG_PORT=8998
+SEQ_PG_PORT=8990
 SEQ_PG_USER=sequelize_test
 SEQ_PG_USER=sequelize_test
 SEQ_PG_PW=sequelize_test
 SEQ_PG_PW=sequelize_test
-SEQ_MSSQL_PORT=8997
+SEQ_MSSQL_PORT=8970
 SEQ_MSSQL_DB=master
 SEQ_MSSQL_DB=master
 SEQ_MSSQL_USER=sa
 SEQ_MSSQL_USER=sa
 SEQ_MSSQL_PW=yourStrong(!)Password
 SEQ_MSSQL_PW=yourStrong(!)Password

test/integration/model/findAll/group.test.js

@@ -44,7 +44,10 @@ describe(Support.getTestDialectTeaser('Model'), () => {
             include: [
             include: [
               { model: Comment, attributes: [] }
               { model: Comment, attributes: [] }
             ],
             ],
-            group: ['Post.id']
+            group: ['Post.id'],
+            order: [
+              ['id']
+            ]
           });
           });
         }).then(posts => {
         }).then(posts => {
           expect(parseInt(posts[0].get('comment_count'))).to.be.equal(3);
           expect(parseInt(posts[0].get('comment_count'))).to.be.equal(3);
@@ -85,7 +88,10 @@ describe(Support.getTestDialectTeaser('Model'), () => {
             include: [
             include: [
               { model: Post, attributes: [] }
               { model: Post, attributes: [] }
             ],
             ],
-            group: ['PostId']
+            group: ['PostId'],
+            order: [
+              ['PostId']
+            ]
           });
           });
         }).then(posts => {
         }).then(posts => {
           expect(posts[0].get().hasOwnProperty('id')).to.equal(false);
           expect(posts[0].get().hasOwnProperty('id')).to.equal(false);