From 0b59d5276d725a7e2bdf4db77810e7e9b62f1f9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20K=C5=99e=C4=8Dan?= Date: Fri, 1 May 2020 09:31:45 +0200 Subject: [PATCH] Make DB columns not null --- .../javacrumbs/shedlock/test/support/jdbc/DbConfig.java | 2 +- .../shedlock/test/support/jdbc/MariaDbConfig.java | 9 ++------- .../shedlock/test/support/jdbc/MsSqlServerConfig.java | 9 ++------- .../shedlock/test/support/jdbc/MySqlConfig.java | 9 ++------- .../shedlock/test/support/jdbc/OracleServerConfig.java | 9 ++------- .../shedlock/test/support/jdbc/PostgresConfig.java | 7 +------ 6 files changed, 10 insertions(+), 35 deletions(-) diff --git a/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/DbConfig.java b/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/DbConfig.java index 907806054..8f5c97dea 100644 --- a/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/DbConfig.java +++ b/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/DbConfig.java @@ -29,6 +29,6 @@ public interface DbConfig { String getPassword(); default String getCreateTableStatement() { - return "CREATE TABLE shedlock(name VARCHAR(64), lock_until TIMESTAMP, locked_at TIMESTAMP, locked_by VARCHAR(255), PRIMARY KEY (name))"; + return "CREATE TABLE shedlock(name VARCHAR(64) NOT NULL, lock_until TIMESTAMP NOT NULL, locked_at TIMESTAMP NOT NULL, locked_by VARCHAR(255) NOT NULL, PRIMARY KEY (name))"; } } diff --git a/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/MariaDbConfig.java b/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/MariaDbConfig.java index f46080c42..6b692722e 100644 --- a/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/MariaDbConfig.java +++ b/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/MariaDbConfig.java @@ -33,12 +33,7 @@ public void startDb() { .withDatabaseName(TEST_SCHEMA_NAME) .withUsername("SA") .withPassword("pass") - .withLogConsumer(new Consumer() { - @Override - public void accept(OutputFrame outputFrame) { - logger.debug(outputFrame.getUtf8String()); - } - }); + .withLogConsumer(outputFrame -> logger.debug(outputFrame.getUtf8String())); mariaDb.start(); } @@ -62,7 +57,7 @@ public String getPassword() { @Override public String getCreateTableStatement() { - return "CREATE TABLE shedlock(name VARCHAR(64), lock_until TIMESTAMP, locked_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, locked_by VARCHAR(255), PRIMARY KEY (name))"; + return "CREATE TABLE shedlock(name VARCHAR(64) NOT NULL, lock_until TIMESTAMP NOT NULL, locked_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, locked_by VARCHAR(255) NOT NULL, PRIMARY KEY (name))"; } private static class MyMariaDbContainer extends MariaDBContainer { diff --git a/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/MsSqlServerConfig.java b/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/MsSqlServerConfig.java index 7dc9ebe85..18d6f6db7 100644 --- a/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/MsSqlServerConfig.java +++ b/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/MsSqlServerConfig.java @@ -29,12 +29,7 @@ public final class MsSqlServerConfig implements DbConfig { public void startDb() { mssql = new MyMSSQLServerContainer() - .withLogConsumer(new Consumer() { - @Override - public void accept(OutputFrame outputFrame) { - logger.debug(outputFrame.getUtf8String()); - } - }); + .withLogConsumer(outputFrame -> logger.debug(outputFrame.getUtf8String())); mssql.start(); } @@ -59,7 +54,7 @@ public String getPassword() { @Override public String getCreateTableStatement() { - return "CREATE TABLE shedlock(name VARCHAR(64), lock_until datetime2, locked_at datetime2, locked_by VARCHAR(255), PRIMARY KEY (name))"; + return "CREATE TABLE shedlock(name VARCHAR(64) NOT NULL, lock_until datetime2 NOT NULL, locked_at datetime2 NOT NULL, locked_by VARCHAR(255) NOT NULL, PRIMARY KEY (name))"; } private static class MyMSSQLServerContainer extends MSSQLServerContainer { diff --git a/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/MySqlConfig.java b/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/MySqlConfig.java index 9f991fa56..739737fcd 100644 --- a/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/MySqlConfig.java +++ b/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/MySqlConfig.java @@ -33,12 +33,7 @@ public void startDb() { .withDatabaseName(TEST_SCHEMA_NAME) .withUsername("SA") .withPassword("pass") - .withLogConsumer(new Consumer() { - @Override - public void accept(OutputFrame outputFrame) { - logger.debug(outputFrame.getUtf8String()); - } - }); + .withLogConsumer(outputFrame -> logger.debug(outputFrame.getUtf8String())); mysql.start(); } @@ -62,7 +57,7 @@ public String getPassword() { @Override public String getCreateTableStatement() { - return "CREATE TABLE shedlock(name VARCHAR(64), lock_until TIMESTAMP(3), locked_at TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3), locked_by VARCHAR(255), PRIMARY KEY (name))"; + return "CREATE TABLE shedlock(name VARCHAR(64) NOT NULL, lock_until TIMESTAMP(3) NOT NULL, locked_at TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), locked_by VARCHAR(255) NOT NULL, PRIMARY KEY (name))"; } private static class MyMySQLContainer extends MySQLContainer { diff --git a/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/OracleServerConfig.java b/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/OracleServerConfig.java index 2a7a28628..bda46333c 100644 --- a/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/OracleServerConfig.java +++ b/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/OracleServerConfig.java @@ -30,12 +30,7 @@ public final class OracleServerConfig implements DbConfig { public void startDb() { oracle = new OracleContainer("oracleinanutshell/oracle-xe-11g") - .withLogConsumer(new Consumer() { - @Override - public void accept(OutputFrame outputFrame) { - logger.debug(outputFrame.getUtf8String()); - } - }); + .withLogConsumer(outputFrame -> logger.debug(outputFrame.getUtf8String())); oracle.start(); } @@ -60,6 +55,6 @@ public String getPassword() { @Override public String getCreateTableStatement() { - return "CREATE TABLE shedlock(name VARCHAR(64), lock_until TIMESTAMP(3), locked_at TIMESTAMP(3), locked_by VARCHAR(255), PRIMARY KEY (name))"; + return "CREATE TABLE shedlock(name VARCHAR(64) NOT NULL, lock_until TIMESTAMP(3) NOT NULL, locked_at TIMESTAMP(3) NOT NULL, locked_by VARCHAR(255) NOT NULL, PRIMARY KEY (name))"; } } diff --git a/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/PostgresConfig.java b/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/PostgresConfig.java index 2793a62ba..1b5c6fbce 100644 --- a/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/PostgresConfig.java +++ b/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/PostgresConfig.java @@ -33,12 +33,7 @@ public void startDb() { .withDatabaseName(TEST_SCHEMA_NAME) .withUsername("SA") .withPassword("pass") - .withLogConsumer(new Consumer() { - @Override - public void accept(OutputFrame outputFrame) { - logger.debug(outputFrame.getUtf8String()); - } - }); + .withLogConsumer(outputFrame -> logger.debug(outputFrame.getUtf8String())); postgres.start(); }