Make DB columns not null

lukas-krecan · May 1, 2020 · 0b59d52 · 0b59d52
1 parent 5907b1d
commit 0b59d52
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 35 deletions.
diff --git a/...k-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/DbConfig.java b/...k-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/...t-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/MariaDbConfig.java b/...t-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<OutputFrame>() {
-                @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<MyMariaDbContainer> {

diff --git a/...pport-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/MsSqlServerConfig.java b/...pport-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<OutputFrame>() {
-                @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<MyMSSQLServerContainer> {

diff --git a/...est-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/MySqlConfig.java b/...est-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<OutputFrame>() {
-                @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<MyMySQLContainer> {

diff --git a/...port-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/OracleServerConfig.java b/...port-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<OutputFrame>() {
-                @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/...-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/PostgresConfig.java b/...-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<OutputFrame>() {
-                @Override
-                public void accept(OutputFrame outputFrame) {
-                    logger.debug(outputFrame.getUtf8String());
-                }
-            });
+            .withLogConsumer(outputFrame -> logger.debug(outputFrame.getUtf8String()));
         postgres.start();
     }