Skip to content

Commit

Permalink
run mysql tests with mysql 5.6 (due to wix-incubator/wix-embedded-mys…
Browse files Browse the repository at this point in the history
  • Loading branch information
ILLKO committed Jul 17, 2019
1 parent 6bb23dd commit 9052683
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion conf/db/migration/default/V24__Image_categories.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
create table category (
id SERIAL not null PRIMARY KEY,
title VARCHAR(255) UNIQUE
title VARCHAR(190) UNIQUE
);

create table category_members (
Expand Down
2 changes: 1 addition & 1 deletion conf/db/migration/default/V2__Create_table_users.sql
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CREATE TABLE users (
id SERIAL not null PRIMARY KEY,
fullname varchar(255) not null,
email varchar(255) UNIQUE not null,
email varchar(190) UNIQUE not null,
created_at timestamp DEFAULT CURRENT_TIMESTAMP,
deleted_at timestamp null,
password varchar(255),
Expand Down
2 changes: 1 addition & 1 deletion conf/db/migration/default/V5__Create_table_images.sql
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ create table images (
last_round int,
width int,
height int,
monument_id varchar(255)
monument_id varchar(190)
);
2 changes: 1 addition & 1 deletion conf/db/migration/default/V6__Create_table_monument.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CREATE TABLE monument (
id varchar(255),
id varchar(190),
name varchar(400) not null,
description varchar(4000),
place text,
Expand Down
4 changes: 2 additions & 2 deletions test/db/scalikejdbc/InMemDb.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import java.util.concurrent.TimeUnit
import com.wix.mysql.EmbeddedMysql.anEmbeddedMysql
import com.wix.mysql.config.DownloadConfig.aDownloadConfig
import com.wix.mysql.config.MysqldConfig.aMysqldConfig
import com.wix.mysql.distribution.Version.v5_7_latest
import com.wix.mysql.distribution.Version.v5_6_latest
import play.api.Application
import play.api.inject.guice.GuiceApplicationBuilder
import play.api.test.Helpers.running
Expand All @@ -20,7 +20,7 @@ trait InMemDb {
val downloadConfig = aDownloadConfig()
.withCacheDir(System.getProperty("user.home") + "/.wixMySQL/downloads")
.build()
val config = aMysqldConfig(v5_7_latest)
val config = aMysqldConfig(v5_6_latest)
.withFreePort()
.withUser("WLXJURY_DB_USER", "WLXJURY_DB_PASSWORD")
.withTimeout(60, TimeUnit.SECONDS)
Expand Down

0 comments on commit 9052683

Please sign in to comment.