Skip to content

Commit

Permalink
Merged branch docker-mysql-travis into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Brian J. Cardiff committed Sep 6, 2016
2 parents 45d3cb4 + a1c2e95 commit 5f86e47
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 7 deletions.
11 changes: 10 additions & 1 deletion .travis.yml
@@ -1,6 +1,15 @@
language: crystal
services:
- mysql
- docker
env:
- MYSQL_DOCKER_IMAGE=mysql:5.7
- MYSQL_DOCKER_IMAGE=mysql:5.6
- MYSQL_DOCKER_IMAGE=mariadb:latest
before_install:
- docker run -e MYSQL_ALLOW_EMPTY_PASSWORD=yes -p 3306:3306 -d ${MYSQL_DOCKER_IMAGE}
- docker ps -a # log docker image
- while ! echo exit | nc localhost 3306; do sleep 5; done # wait mysql to start accepting connections
- sleep 15
script:
- crystal spec
- crystal tool format --check
12 changes: 6 additions & 6 deletions spec/driver_spec.cr
Expand Up @@ -50,24 +50,24 @@ describe Driver do
it "should connect with credentials" do
with_db do |db|
db.scalar("SELECT DATABASE()").should be_nil
db.scalar("SELECT CURRENT_USER()").should eq("root@localhost")
db.scalar("SELECT CURRENT_USER()").should match(/^root@(localhost|%)$/)

# ensure user is deleted
db.exec "GRANT USAGE ON *.* TO crystal_test@localhost IDENTIFIED BY 'secret'"
db.exec "DROP USER crystal_test@localhost"
db.exec "GRANT USAGE ON *.* TO crystal_test IDENTIFIED BY 'secret'"
db.exec "DROP USER crystal_test"
db.exec "DROP DATABASE IF EXISTS crystal_mysql_test"
db.exec "FLUSH PRIVILEGES"

# create test db with user
db.exec "CREATE DATABASE crystal_mysql_test"
db.exec "CREATE USER crystal_test@localhost IDENTIFIED BY 'secret'"
db.exec "GRANT ALL PRIVILEGES ON crystal_mysql_test.* TO crystal_test@localhost"
db.exec "CREATE USER crystal_test IDENTIFIED BY 'secret'"
db.exec "GRANT ALL PRIVILEGES ON crystal_mysql_test.* TO crystal_test"
db.exec "FLUSH PRIVILEGES"
end

DB.open "mysql://crystal_test:secret@localhost/crystal_mysql_test" do |db|
db.scalar("SELECT DATABASE()").should eq("crystal_mysql_test")
db.scalar("SELECT CURRENT_USER()").should eq("crystal_test@localhost")
db.scalar("SELECT CURRENT_USER()").should match(/^crystal_test@(localhost|%)$/)
end

with_db do |db|
Expand Down

0 comments on commit 5f86e47

Please sign in to comment.