Fix an issue in a fresh MySQL / Mariadb install with the migrations. (#79)

Author: gjong

fintrack-api/src/main/resources/application-mysql.yml

@@ -6,6 +6,11 @@ datasources:
     password: ${DATABASE_PASSWORD:fintrack}
     dialect: mysql
 
+jpa:
+  default:
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.MySQLDialect
 flyway:
   datasources:
     default:

jpa-repository/src/main/java/com/jongsoft/finance/jpa/core/entity/SettingJpa.java

@@ -1,9 +1,7 @@
 package com.jongsoft.finance.jpa.core.entity;
 
-import jakarta.persistence.*;
-
 import com.jongsoft.finance.core.SettingType;
-
+import jakarta.persistence.*;
 import lombok.Builder;
 import lombok.Getter;
 
@@ -17,7 +15,7 @@ public class SettingJpa extends EntityJpa {
     @Enumerated(EnumType.STRING)
     private SettingType type;
 
-    @Column(name = "`value`")
+    @Column(name = "setting_val")
     private String value;
 
     public SettingJpa() {

jpa-repository/src/main/java/com/jongsoft/finance/jpa/query/expression/FieldCondition.java

@@ -3,6 +3,8 @@
 import com.jongsoft.finance.jpa.query.BooleanExpression;
 import jakarta.persistence.Query;
 
+import java.util.function.Supplier;
+
 record FieldCondition(String tableAlias, String fieldId, String field, FieldEquation equation, Object value) implements BooleanExpression {
     @Override
     public String hqlExpression() {
@@ -16,14 +18,19 @@ public String hqlExpression() {
             case LIKE -> "LIKE";
         };
 
+        Supplier<String> fieldFunc = () -> "%s%s".formatted(actualAlias, field);
+        if (value instanceof String && equation == FieldEquation.LIKE) {
+            fieldFunc = () -> "lower(%s%s)".formatted(actualAlias, field);
+        }
+
         if (equation == FieldEquation.IN) {
-            return " %s%s IN(:%s) ".formatted(actualAlias, field, fieldId);
+            return " %s IN(:%s) ".formatted(fieldFunc.get(), fieldId);
         } else if (equation == FieldEquation.NIN) {
-            return " %s%s NOT IN(:%s) ".formatted(actualAlias, field, fieldId);
+            return " %s NOT IN(:%s) ".formatted(fieldFunc.get(), fieldId);
 
         }
 
-        return " %s%s %s :%s ".formatted(actualAlias, field, comparator, fieldId);
+        return " %s %s :%s ".formatted(fieldFunc.get(), comparator, fieldId);
     }
 
     @Override

jpa-repository/src/main/java/com/jongsoft/finance/jpa/rule/RuleChangeJpa.java

@@ -1,10 +1,8 @@
 package com.jongsoft.finance.jpa.rule;
 
-import jakarta.persistence.*;
-
 import com.jongsoft.finance.core.RuleColumn;
 import com.jongsoft.finance.jpa.core.entity.EntityJpa;
-
+import jakarta.persistence.*;
 import lombok.Builder;
 import lombok.Getter;
 
@@ -16,7 +14,7 @@ public class RuleChangeJpa extends EntityJpa {
     @Enumerated(value = EnumType.STRING)
     private RuleColumn field;
 
-    @Column(name = "`value`")
+    @Column(name = "change_val")
     private String value;
 
     @ManyToOne

jpa-repository/src/main/java/com/jongsoft/finance/jpa/transaction/TransactionFilterCommand.java

@@ -49,7 +49,7 @@ public TransactionProvider.FilterCommand categories(Sequence<EntityRef> value) {
 
     @Override
     public TransactionProvider.FilterCommand contracts(Sequence<EntityRef> value) {
-        query().fieldEqOneOf("contracts.id", ID_REDUCER.apply(value).toArray());
+        query().fieldEqOneOf("contract.id", ID_REDUCER.apply(value).toArray());
         return this;
     }
 
@@ -65,9 +65,9 @@ public TransactionProvider.FilterCommand name(String value, boolean exact) {
             subQuery.fieldNull("deleted")
                     .from("transactions");
             if (exact) {
-                subQuery.fieldEq("name", value);
+                subQuery.fieldEq("account.name", value);
             } else {
-                subQuery.fieldLike("name", value);
+                subQuery.fieldLike("account.name", value.toLowerCase());
             }
         });
         return this;
@@ -77,8 +77,8 @@ public TransactionProvider.FilterCommand name(String value, boolean exact) {
     public TransactionProvider.FilterCommand description(String value, boolean exact) {
         query().condition(
                 Expressions.or(
-                        Expressions.fieldLike("e", "description", value),
-                        Expressions.fieldLike("t", "description", value))
+                        Expressions.fieldLike("e", "description", value.toLowerCase()),
+                        Expressions.fieldLike("t", "description", value.toLowerCase()))
         );
 
         return this;

jpa-repository/src/main/resources/db/migration/V20190306074220__add_rule_structures.sql

@@ -26,7 +26,7 @@ create table rule_change
 (
   id      bigint       not null auto_increment,
   field   int          not null,
-  "value" varchar(255) not null,
+  `value` varchar(255) not null,
   rule_id bigint       not null,
 
   constraint pk_rule_change primary key (id),

jpa-repository/src/main/resources/db/migration/V20190814085724__add_application_settings.sql

@@ -3,13 +3,13 @@ create table setting
     id    bigint       not null auto_increment,
     name  varchar(255) not null,
     type  varchar(255) not null,
-    "value" varchar(255) not null,
+    `value` varchar(255) not null,
 
     constraint pk_setting primary key (id),
     constraint uq_setting unique (name)
 );
 
-insert into setting (id, name, type, "value")
+insert into setting (id, name, type, `value`)
 values (null, 'RegistrationOpen', 'FLAG', '1'),
        (null, 'ImportOutdated', 'FLAG', '1'),
        (null, 'AnalysisBudgetMonths', 'NUMBER', '3');

jpa-repository/src/main/resources/db/migration/V20200221125652__add_additional_settings.sql

@@ -1,4 +1,4 @@
-insert into setting (id, name, type, "value") values
+insert into setting (id, name, type, `value`) values
     (null, 'AnalysisBudgetDeviation', 'NUMBER', '0.25'),
     (null, 'AutocompleteLimit', 'NUMBER', '10'),
     (null, 'RecordSetPageSize', 'NUMBER', '20');

jpa-repository/src/main/resources/db/migration/V20200501165455__fix_incorrect_application_settings.sql

@@ -1,9 +1,9 @@
 update setting
-set "value" = 'true'
-where "value" = '1'
+set `value` = 'true'
+where `value` = '1'
   and type = 'FLAG';
 
 update setting
-set "value" = 'false'
-where "value" = '0'
+set `value` = 'false'
+where `value` = '0'
   and type = 'FLAG';

jpa-repository/src/main/resources/db/migration/V20250221101926__rename_value_fields.sql

@@ -0,0 +1,5 @@
+alter table rule_change
+    change `value` change_val varchar(255);
+
+alter table setting
+    change `value` setting_val varchar(255);