From 35b281379604827d2a5b6a9a06f32aeff493b155 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Fri, 21 Feb 2020 10:07:08 +0000
Subject: [PATCH] Add test for mysql8.0 (#1538)

Fix pk order on test

Add test for mysql8.0

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1538
---
 .drone.yml         | 31 +++++++++++++++++++++++++++++++
 session_pk_test.go |  7 +++++--
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 0a535c6c..7a273d3d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -45,6 +45,24 @@ steps:
     - push
     - pull_request
 
+- name: test-mysql8
+  image: golang:1.12
+  environment:
+    GO111MODULE: "on"
+    GOPROXY: "https://goproxy.cn"
+    TEST_MYSQL_HOST: mysql8
+    TEST_MYSQL_CHARSET: utf8mb4
+    TEST_MYSQL_DBNAME: xorm_test
+    TEST_MYSQL_USERNAME: root
+    TEST_MYSQL_PASSWORD:
+  commands:
+  - make test-mysql
+  - TEST_CACHE_ENABLE=true make test-mysql
+  when:
+    event:
+    - push
+    - pull_request
+
 - name: test-mysql-utf8mb4
   image: golang:1.12
   depends_on:
@@ -170,6 +188,7 @@ steps:
   - test-vet
   - test-sqlite
   - test-mysql
+  - test-mysql8
   - test-mymysql
   - test-postgres
   - test-postgres-schema
@@ -196,6 +215,18 @@ services:
     - tag
     - pull_request
 
+- name: mysql8
+  pull: default
+  image: mysql:8.0
+  environment:
+    MYSQL_ALLOW_EMPTY_PASSWORD: yes
+    MYSQL_DATABASE: xorm_test
+  when:
+    event:
+    - push
+    - tag
+    - pull_request
+
 - name: pgsql
   pull: default
   image: postgres:9.5
diff --git a/session_pk_test.go b/session_pk_test.go
index 2f54b5bf..039ab367 100644
--- a/session_pk_test.go
+++ b/session_pk_test.go
@@ -6,6 +6,7 @@ package xorm
 
 import (
 	"errors"
+	"sort"
 	"testing"
 	"time"
 
@@ -1141,8 +1142,10 @@ func TestCompositePK(t *testing.T) {
 
 	pkCols := table.PKColumns()
 	assert.EqualValues(t, 2, len(pkCols))
-	assert.EqualValues(t, "uid", pkCols[0].Name)
-	assert.EqualValues(t, "tid", pkCols[1].Name)
+
+	names := []string{pkCols[0].Name, pkCols[1].Name}
+	sort.Strings(names)
+	assert.EqualValues(t, []string{"tid", "uid"}, names)
 }
 
 func TestNoPKIdQueryUpdate(t *testing.T) {