Skip to content

Commit 8d3f363

Browse files
ZwergalZwergal
committed
refactored code
Signed-off-by: Max Stemplinger <ms@campudus.com>
1 parent d105035 commit 8d3f363

File tree

2 files changed

+40
-46
lines changed

2 files changed

+40
-46
lines changed

‎src/test/scala/io/vertx/asyncsql/test/SqlTestVerticle.scala

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -73,29 +73,26 @@ abstract class SqlTestVerticle extends TestVerticle with BaseVertxIntegrationTes
7373
reply
7474
}
7575

76-
protected def createDateTable(dateDataType: String) = s"""
77-
| CREATE TABLE date_test (
78-
| id SERIAL,
79-
| test_date $dateDataType
80-
| );
81-
""".stripMargin
82-
83-
protected def createTableStatement(tableName: String) = s"""
84-
DROP TABLE IF EXISTS $tableName;
85-
CREATE TABLE $tableName (
86-
id SERIAL,
87-
name VARCHAR(255),
88-
email VARCHAR(255) UNIQUE,
89-
is_male BOOLEAN,
90-
age INT,
91-
money DOUBLE PRECISION,
92-
wedding_date DATE
93-
);"""
76+
protected def createDateTable(dateDataType: String) = s"""CREATE TABLE date_test (
77+
| id SERIAL,
78+
| test_date $dateDataType
79+
|);""".stripMargin
80+
81+
protected def createTableStatement(tableName: String) = s"""DROP TABLE IF EXISTS $tableName;
82+
CREATE TABLE $tableName (
83+
| id SERIAL,
84+
| name VARCHAR(255),
85+
| email VARCHAR(255) UNIQUE,
86+
| is_male BOOLEAN,
87+
| age INT,
88+
| money DOUBLE PRECISION,
89+
| wedding_date DATE
90+
|);""".stripMargin
9491

9592
protected def createTableTestTwo: String = s"""CREATE TABLE test_two (
96-
| id SERIAL,
97-
| name VARCHAR(255),
98-
| one_id BIGINT NOT NULL,
99-
| PRIMARY KEY (id)
100-
|);""".stripMargin
93+
| id SERIAL,
94+
| name VARCHAR(255),
95+
| one_id BIGINT NOT NULL,
96+
| PRIMARY KEY (id)
97+
|);""".stripMargin
10198
}

‎src/test/scala/io/vertx/asyncsql/test/mysql/MySqlTest.scala

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,29 @@ class MySqlTest extends SqlTestVerticle with BaseSqlTests {
1111

1212
override def getConfig() = baseConf.putString("connection", "MySQL")
1313

14-
override def createDateTable(dateDataType: String) = s"""
15-
| CREATE TABLE date_test (
16-
| id INT NOT NULL AUTO_INCREMENT,
17-
| test_date $dateDataType,
18-
| PRIMARY KEY(id)
19-
| );
20-
""".stripMargin
14+
override def createDateTable(dateDataType: String) = s"""CREATE TABLE date_test (
15+
| id INT NOT NULL AUTO_INCREMENT,
16+
| test_date $dateDataType,
17+
| PRIMARY KEY(id)
18+
|);""".stripMargin
2119

22-
override def createTableStatement(tableName: String) = s"""
23-
CREATE TABLE $tableName (
24-
id INT NOT NULL AUTO_INCREMENT,
25-
name VARCHAR(255),
26-
email VARCHAR(255) UNIQUE,
27-
is_male BOOLEAN,
28-
age INT,
29-
money FLOAT,
30-
wedding_date DATE,
31-
PRIMARY KEY (id)
32-
);""".stripMargin
20+
override def createTableStatement(tableName: String) = s"""CREATE TABLE $tableName (
21+
| id INT NOT NULL AUTO_INCREMENT,
22+
| name VARCHAR(255),
23+
| email VARCHAR(255) UNIQUE,
24+
| is_male BOOLEAN,
25+
| age INT,
26+
| money FLOAT,
27+
| wedding_date DATE,
28+
| PRIMARY KEY (id)
29+
|);""".stripMargin
3330

3431
override def createTableTestTwo: String = """CREATE TABLE test_two (
35-
| id SERIAL,
36-
| name VARCHAR(255),
37-
| one_id BIGINT UNSIGNED NOT NULL,
38-
| PRIMARY KEY (id)
39-
|);""".stripMargin
32+
| id SERIAL,
33+
| name VARCHAR(255),
34+
| one_id BIGINT UNSIGNED NOT NULL,
35+
| PRIMARY KEY (id)
36+
|);""".stripMargin
4037

4138
@Test
4239
def datetimeTest(): Unit =

0 commit comments

Comments
 (0)