From 24adc042659ad952495aec9dfeb8d37f664835cd Mon Sep 17 00:00:00 2001 From: Jazzkuh Date: Sun, 26 Jun 2022 17:40:36 +0200 Subject: [PATCH 1/5] Fix booleans? --- .../storm/parser/types/objects/adapters/BooleanAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/craftmend/storm/parser/types/objects/adapters/BooleanAdapter.java b/src/main/java/com/craftmend/storm/parser/types/objects/adapters/BooleanAdapter.java index 8d3712b..e2b92fe 100644 --- a/src/main/java/com/craftmend/storm/parser/types/objects/adapters/BooleanAdapter.java +++ b/src/main/java/com/craftmend/storm/parser/types/objects/adapters/BooleanAdapter.java @@ -17,7 +17,7 @@ public Boolean fromSql(ParsedField parsedField, Object sqlValue) { @Override public Object toSql(Storm storm, Boolean value) { - return value; + return value ? 1 : 0; } @Override From e4de162fc3aec1974620db00d184d2bb298c6224 Mon Sep 17 00:00:00 2001 From: Jazzkuh Date: Sun, 26 Jun 2022 17:47:30 +0200 Subject: [PATCH 2/5] Fuck booleans --- .../storm/parser/types/objects/adapters/BooleanAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/craftmend/storm/parser/types/objects/adapters/BooleanAdapter.java b/src/main/java/com/craftmend/storm/parser/types/objects/adapters/BooleanAdapter.java index e2b92fe..f624c2d 100644 --- a/src/main/java/com/craftmend/storm/parser/types/objects/adapters/BooleanAdapter.java +++ b/src/main/java/com/craftmend/storm/parser/types/objects/adapters/BooleanAdapter.java @@ -22,7 +22,7 @@ public Object toSql(Storm storm, Boolean value) { @Override public String getSqlBaseType() { - return "BOOLEAN"; + return "INTEGER"; } @Override From 8b2f9b0166742b0281d34f062933f0e998d8be1f Mon Sep 17 00:00:00 2001 From: Jazzkuh Date: Fri, 28 Oct 2022 18:15:14 +0200 Subject: [PATCH 3/5] Log statement --- src/main/java/com/craftmend/storm/Storm.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/craftmend/storm/Storm.java b/src/main/java/com/craftmend/storm/Storm.java index e14e663..77fa00a 100644 --- a/src/main/java/com/craftmend/storm/Storm.java +++ b/src/main/java/com/craftmend/storm/Storm.java @@ -85,6 +85,7 @@ public void runMigrations() throws SQLException { if (!tables.next()) { // table doesn't exist.. creating logger.info("Creating table " + parsed.getTableName() + "..."); + logger.warning("Statement: " + model.statements().buildSqlTableCreateStatement(driver.getDialect(), this)); driver.execute(model.statements().buildSqlTableCreateStatement(driver.getDialect(), this)); } } From 34f9f28684fe6c82d1b6353297e449111df77b0f Mon Sep 17 00:00:00 2001 From: Jazzkuh Date: Fri, 28 Oct 2022 18:24:16 +0200 Subject: [PATCH 4/5] Possible fix? --- .../com/craftmend/storm/dialect/mariadb/MariaDialect.java | 4 ++-- .../com/craftmend/storm/dialect/sqlite/SqliteDialect.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/craftmend/storm/dialect/mariadb/MariaDialect.java b/src/main/java/com/craftmend/storm/dialect/mariadb/MariaDialect.java index e4e5878..dc34e34 100644 --- a/src/main/java/com/craftmend/storm/dialect/mariadb/MariaDialect.java +++ b/src/main/java/com/craftmend/storm/dialect/mariadb/MariaDialect.java @@ -16,10 +16,10 @@ public ColumnDefinition compileColumn(ParsedField modelField) { sqlTypeDeclaration = sqlTypeDeclaration.replace("%max", modelField.getMax() + ""); String column = modelField.getColumnName() + " " + sqlTypeDeclaration + - (modelField.getKeyType() == KeyType.PRIMARY ? " PRIMARY KEY" : "") + - (modelField.isAutoIncrement() ? " AUTO_INCREMENT" : "") + + (modelField.getKeyType() == KeyType.PRIMARY ? " PRIMARY KEY" : "") + + (modelField.getDefaultValue() != null ? " DEFAULT(" + (modelField.getAdapter().escapeAsString() ? "'" + modelField.getDefaultValue() + "'" : modelField.getDefaultValue()) + ")" : "") + diff --git a/src/main/java/com/craftmend/storm/dialect/sqlite/SqliteDialect.java b/src/main/java/com/craftmend/storm/dialect/sqlite/SqliteDialect.java index 3f3330e..9765d4e 100644 --- a/src/main/java/com/craftmend/storm/dialect/sqlite/SqliteDialect.java +++ b/src/main/java/com/craftmend/storm/dialect/sqlite/SqliteDialect.java @@ -16,10 +16,10 @@ public ColumnDefinition compileColumn(ParsedField modelField) { sqlTypeDeclaration = sqlTypeDeclaration.replace("%max", modelField.getMax() + ""); String column = modelField.getColumnName() + " " + sqlTypeDeclaration + - (modelField.getKeyType() == KeyType.PRIMARY ? " PRIMARY KEY" : "") + - (modelField.isAutoIncrement() ? " AUTOINCREMENT" : "") + + (modelField.getKeyType() == KeyType.PRIMARY ? " PRIMARY KEY" : "") + + (modelField.getDefaultValue() != null ? " DEFAULT(" + (modelField.getAdapter().escapeAsString() ? "'" + modelField.getDefaultValue() + "'" : modelField.getDefaultValue()) + ")" : "") + From c6e3759fb9246471235cae01c3ad94cfddcbb866 Mon Sep 17 00:00:00 2001 From: Jazzkuh Date: Fri, 28 Oct 2022 18:31:29 +0200 Subject: [PATCH 5/5] Little warning that you cant use the term CONDITION might be nice --- .../com/craftmend/storm/dialect/mariadb/MariaDialect.java | 4 ++-- .../com/craftmend/storm/dialect/sqlite/SqliteDialect.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/craftmend/storm/dialect/mariadb/MariaDialect.java b/src/main/java/com/craftmend/storm/dialect/mariadb/MariaDialect.java index dc34e34..e4e5878 100644 --- a/src/main/java/com/craftmend/storm/dialect/mariadb/MariaDialect.java +++ b/src/main/java/com/craftmend/storm/dialect/mariadb/MariaDialect.java @@ -16,10 +16,10 @@ public ColumnDefinition compileColumn(ParsedField modelField) { sqlTypeDeclaration = sqlTypeDeclaration.replace("%max", modelField.getMax() + ""); String column = modelField.getColumnName() + " " + sqlTypeDeclaration + - (modelField.isAutoIncrement() ? " AUTO_INCREMENT" : "") + - (modelField.getKeyType() == KeyType.PRIMARY ? " PRIMARY KEY" : "") + + (modelField.isAutoIncrement() ? " AUTO_INCREMENT" : "") + + (modelField.getDefaultValue() != null ? " DEFAULT(" + (modelField.getAdapter().escapeAsString() ? "'" + modelField.getDefaultValue() + "'" : modelField.getDefaultValue()) + ")" : "") + diff --git a/src/main/java/com/craftmend/storm/dialect/sqlite/SqliteDialect.java b/src/main/java/com/craftmend/storm/dialect/sqlite/SqliteDialect.java index 9765d4e..3f3330e 100644 --- a/src/main/java/com/craftmend/storm/dialect/sqlite/SqliteDialect.java +++ b/src/main/java/com/craftmend/storm/dialect/sqlite/SqliteDialect.java @@ -16,10 +16,10 @@ public ColumnDefinition compileColumn(ParsedField modelField) { sqlTypeDeclaration = sqlTypeDeclaration.replace("%max", modelField.getMax() + ""); String column = modelField.getColumnName() + " " + sqlTypeDeclaration + - (modelField.isAutoIncrement() ? " AUTOINCREMENT" : "") + - (modelField.getKeyType() == KeyType.PRIMARY ? " PRIMARY KEY" : "") + + (modelField.isAutoIncrement() ? " AUTOINCREMENT" : "") + + (modelField.getDefaultValue() != null ? " DEFAULT(" + (modelField.getAdapter().escapeAsString() ? "'" + modelField.getDefaultValue() + "'" : modelField.getDefaultValue()) + ")" : "") +