From 506725b96ddde9f951f9eae406d808122adb27d0 Mon Sep 17 00:00:00 2001 From: wea_ondara Date: Sun, 27 Nov 2022 08:20:00 +0100 Subject: [PATCH] fix sqlType missing in hashCode of DbField, also add it to moldelbuilder diff check test function --- core/src/main/java/jef/model/DbField.java | 2 +- core/src/test/java/jef/model/ModelBuilderCloneTest.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/jef/model/DbField.java b/core/src/main/java/jef/model/DbField.java index fa73e9f..a615a2c 100644 --- a/core/src/main/java/jef/model/DbField.java +++ b/core/src/main/java/jef/model/DbField.java @@ -133,7 +133,7 @@ public class DbField { public int hashCode() { return Objects.hash(entity.getName(), typeName, type, field == null ? null : field.getName(), isModelField, isDatabaseField, exposingForeignKeyOf == null ? null : exposingForeignKeyOf.getName(), - name, notNull, generated); + name, notNull, sqlType, generated); } @Override diff --git a/core/src/test/java/jef/model/ModelBuilderCloneTest.java b/core/src/test/java/jef/model/ModelBuilderCloneTest.java index e8b493b..cc7846a 100644 --- a/core/src/test/java/jef/model/ModelBuilderCloneTest.java +++ b/core/src/test/java/jef/model/ModelBuilderCloneTest.java @@ -177,6 +177,11 @@ public class ModelBuilderCloneTest { System.out.println("ex: " + of.isNotNull()); System.out.println("ac: " + cf.isNotNull()); } + if (!Objects.equals(of.getSqlType(), cf.getSqlType())) { + System.out.println("is sqltype differ: entity " + o.getName() + ", field " + of.getName()); + System.out.println("ex: " + of.getSqlType()); + System.out.println("ac: " + cf.getSqlType()); + } if (of.getGenerated() != cf.getGenerated()) { System.out.println("is generated differ: entity " + o.getName() + ", field " + of.getName()); System.out.println("ex: " + of.getGenerated());