Skip to content

Commit 7d54949

Browse files
committed
Merge branch 'master' into feature/connection-attributes
* master: (93 commits) return unsigned in database type name when necessary (#1238) add an invalid DSN test case (#1235) refactoring (*textRows).readRow in a more clear way (#1230) use utf8mb4 instead of utf8 in TestCharset (#1228) improve readability follows go-staticcheck (#1227) support Is comparison on MySQLError (#1210) Wording correction in README (#1218) noCopy implements sync.Locker (#1216) Fix readme: MaxIdle is same or less than MaxOpen (#1215) Drop support of Go 1.12 (#1211) Release v1.6.0 (#1197) add Go 1.16 to the build matrix (#1198) Implement driver.Validator interface (#1174) handling decoding pem error (#1192) stop rounding times (#1172) improve GitHub Actions workflows (#1190) Move tests from Travis to Actions (#1183) Fix go vet error (#1173) README: Make usage code more friendly (#1170) Fix a broken link to cleartext client side plugin (#1165) ...
2 parents 26b97ba + e8f8fcd commit 7d54949

39 files changed

+2706
-1133
lines changed
File renamed without changes.

.github/workflows/test.yml

+102
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
name: test
2+
on:
3+
pull_request:
4+
push:
5+
workflow_dispatch:
6+
7+
env:
8+
MYSQL_TEST_USER: gotest
9+
MYSQL_TEST_PASS: secret
10+
MYSQL_TEST_ADDR: 127.0.0.1:3306
11+
MYSQL_TEST_CONCURRENT: 1
12+
13+
jobs:
14+
list:
15+
runs-on: ubuntu-latest
16+
outputs:
17+
matrix: ${{ steps.set-matrix.outputs.matrix }}
18+
steps:
19+
- name: list
20+
id: set-matrix
21+
run: |
22+
import json
23+
go = [
24+
# Keep the most recent production release at the top
25+
'1.16',
26+
# Older production releases
27+
'1.15',
28+
'1.14',
29+
'1.13',
30+
]
31+
mysql = [
32+
'8.0',
33+
'5.7',
34+
'5.6',
35+
'mariadb-10.5',
36+
'mariadb-10.4',
37+
'mariadb-10.3',
38+
]
39+
40+
includes = []
41+
# Go versions compatibility check
42+
for v in go[1:]:
43+
includes.append({'os': 'ubuntu-latest', 'go': v, 'mysql': mysql[0]})
44+
45+
matrix = {
46+
# OS vs MySQL versions
47+
'os': [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ],
48+
'go': [ go[0] ],
49+
'mysql': mysql,
50+
51+
'include': includes
52+
}
53+
output = json.dumps(matrix, separators=(',', ':'))
54+
print('::set-output name=matrix::{0}'.format(output))
55+
shell: python
56+
test:
57+
needs: list
58+
runs-on: ${{ matrix.os }}
59+
strategy:
60+
fail-fast: false
61+
matrix: ${{ fromJSON(needs.list.outputs.matrix) }}
62+
steps:
63+
- uses: actions/checkout@v2
64+
- uses: actions/setup-go@v2
65+
with:
66+
go-version: ${{ matrix.go }}
67+
- uses: shogo82148/actions-setup-mysql@v1
68+
with:
69+
mysql-version: ${{ matrix.mysql }}
70+
user: ${{ env.MYSQL_TEST_USER }}
71+
password: ${{ env.MYSQL_TEST_PASS }}
72+
my-cnf: |
73+
innodb_log_file_size=256MB
74+
innodb_buffer_pool_size=512MB
75+
max_allowed_packet=16MB
76+
; TestConcurrent fails if max_connections is too large
77+
max_connections=50
78+
local_infile=1
79+
- name: setup database
80+
run: |
81+
mysql --user 'root' --host '127.0.0.1' -e 'create database gotest;'
82+
83+
- name: test
84+
run: |
85+
go test -v '-covermode=count' '-coverprofile=coverage.out'
86+
87+
- name: Send coverage
88+
uses: shogo82148/actions-goveralls@v1
89+
with:
90+
path-to-profile: coverage.out
91+
flag-name: ${{ runner.os }}-Go-${{ matrix.go }}-DB-${{ matrix.mysql }}
92+
parallel: true
93+
94+
# notifies that all test jobs are finished.
95+
finish:
96+
needs: test
97+
if: always()
98+
runs-on: ubuntu-latest
99+
steps:
100+
- uses: shogo82148/actions-goveralls@v1
101+
with:
102+
parallel-finished: true

.travis.yml

-107
This file was deleted.

.travis/docker.cnf

-5
This file was deleted.

.travis/gofmt.sh

-7
This file was deleted.

.travis/wait_mysql.sh

-8
This file was deleted.

AUTHORS

+32
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,17 @@
1313

1414
Aaron Hopkins <go-sql-driver at die.net>
1515
Achille Roussel <achille.roussel at gmail.com>
16+
Alex Snast <alexsn at fb.com>
1617
Alexey Palazhchenko <alexey.palazhchenko at gmail.com>
1718
Andrew Reid <andrew.reid at tixtrack.com>
19+
Animesh Ray <mail.rayanimesh at gmail.com>
1820
Arne Hormann <arnehormann at gmail.com>
21+
Ariel Mashraki <ariel at mashraki.co.il>
1922
Asta Xie <xiemengjun at gmail.com>
2023
Bulat Gaifullin <gaifullinbf at gmail.com>
24+
Caine Jette <jette at alum.mit.edu>
2125
Carlos Nieto <jose.carlos at menteslibres.net>
26+
Chris Kirkland <chriskirkland at github.com>
2227
Chris Moos <chris at tech9computers.com>
2328
Craig Wilson <craiggwilson at gmail.com>
2429
Daniel Montoya <dsmontoyam at gmail.com>
@@ -27,26 +32,33 @@ Daniël van Eeden <git at myname.nl>
2732
Dave Protasowski <dprotaso at gmail.com>
2833
DisposaBoy <disposaboy at dby.me>
2934
Egor Smolyakov <egorsmkv at gmail.com>
35+
Erwan Martin <hello at erwan.io>
3036
Evan Shaw <evan at vendhq.com>
3137
Frederick Mayle <frederickmayle at gmail.com>
3238
Gustavo Kristic <gkristic at gmail.com>
3339
Hajime Nakagami <nakagami at gmail.com>
3440
Hanno Braun <mail at hannobraun.com>
3541
Henri Yandell <flamefew at gmail.com>
3642
Hirotaka Yamamoto <ymmt2005 at gmail.com>
43+
Huyiguang <hyg at webterren.com>
3744
ICHINOSE Shogo <shogo82148 at gmail.com>
45+
Ilia Cimpoes <ichimpoesh at gmail.com>
3846
INADA Naoki <songofacandy at gmail.com>
3947
Jacek Szwec <szwec.jacek at gmail.com>
4048
James Harr <james.harr at gmail.com>
49+
Janek Vedock <janekvedock at comcast.net>
4150
Jeff Hodges <jeff at somethingsimilar.com>
4251
Jeffrey Charles <jeffreycharles at gmail.com>
52+
Jerome Meyer <jxmeyer at gmail.com>
53+
Jiajia Zhong <zhong2plus at gmail.com>
4354
Jian Zhen <zhenjl at gmail.com>
4455
Joshua Prunier <joshua.prunier at gmail.com>
4556
Julien Lefevre <julien.lefevr at gmail.com>
4657
Julien Schmidt <go-sql-driver at julienschmidt.com>
4758
Justin Li <jli at j-li.net>
4859
Justin Nuß <nuss.justin at gmail.com>
4960
Kamil Dziedzic <kamil at klecza.pl>
61+
Kei Kamikawa <x00.x7f.x86 at gmail.com>
5062
Kevin Malachowski <kevin at chowski.com>
5163
Kieron Woodhouse <kieron.woodhouse at infosum.com>
5264
Lennart Rudolph <lrudolph at hmc.edu>
@@ -55,9 +67,11 @@ Linh Tran Tuan <linhduonggnu at gmail.com>
5567
Lion Yang <lion at aosc.xyz>
5668
Luca Looz <luca.looz92 at gmail.com>
5769
Lucas Liu <extrafliu at gmail.com>
70+
Lunny Xiao <xiaolunwen at gmail.com>
5871
Luke Scott <luke at webconnex.com>
5972
Maciej Zimnoch <maciej.zimnoch at codilime.com>
6073
Michael Woolnough <michael.woolnough at gmail.com>
74+
Nathanial Murphy <nathanial.murphy at gmail.com>
6175
Nicola Peduzzi <thenikso at gmail.com>
6276
Olivier Mengué <dolmen at cpan.org>
6377
oscarzhao <oscarzhaosl at gmail.com>
@@ -68,23 +82,41 @@ Reed Allman <rdallman10 at gmail.com>
6882
Richard Wilkes <wilkes at me.com>
6983
Robert Russell <robert at rrbrussell.com>
7084
Runrioter Wung <runrioter at gmail.com>
85+
Sho Iizuka <sho.i518 at gmail.com>
86+
Sho Ikeda <suicaicoca at gmail.com>
7187
Shuode Li <elemount at qq.com>
88+
Simon J Mudd <sjmudd at pobox.com>
7289
Soroush Pour <me at soroushjp.com>
7390
Stan Putrya <root.vagner at gmail.com>
7491
Stanley Gunawan <gunawan.stanley at gmail.com>
92+
Steven Hartland <steven.hartland at multiplay.co.uk>
93+
Tan Jinhua <312841925 at qq.com>
94+
Thomas Wodarek <wodarekwebpage at gmail.com>
95+
Tim Ruffles <timruffles at gmail.com>
96+
Tom Jenkinson <tom at tjenkinson.me>
7597
Vasily Fedoseyev <vasilyfedoseyev at gmail.com>
98+
Vladimir Kovpak <cn007b at gmail.com>
99+
Vladyslav Zhelezniak <zhvladi at gmail.com>
76100
Xiangyu Hu <xiangyu.hu at outlook.com>
77101
Xiaobing Jiang <s7v7nislands at gmail.com>
78102
Xiuming Chen <cc at cxm.cc>
103+
Xuehong Chan <chanxuehong at gmail.com>
79104
Zhenye Xie <xiezhenye at gmail.com>
105+
Zhixin Wen <john.wenzhixin at gmail.com>
106+
Ziheng Lyu <zihenglv at gmail.com>
80107

81108
# Organizations
82109

83110
Barracuda Networks, Inc.
84111
Counting Ltd.
112+
DigitalOcean Inc.
113+
Facebook Inc.
114+
GitHub Inc.
85115
Google Inc.
86116
InfoSum Ltd.
87117
Keybase Inc.
118+
Multiplay Ltd.
88119
Percona LLC
89120
Pivotal Inc.
90121
Stripe Inc.
122+
Zendesk Inc.

0 commit comments

Comments
 (0)