kotlin-orm · vincentlauvlwj · Jan 29, 2021 · Jan 25, 2021 · Jan 25, 2021 · Jan 25, 2021
diff --git a/build.gradle b/build.gradle
@@ -162,6 +162,11 @@ subprojects { project ->
                             name = "Pedro Domingues"
                             email = "pedro.domingues.pt@gmail.com"
                         }
+                        developer {
+                            id = "efenderbosch"
+                            name = "Eric Fenderbosch"
+                            email = "eric@fender.net"
+                        }
                     }
                     scm {
                         url = "https://github.com/kotlin-orm/ktorm.git"

diff --git a/ktorm-core/src/main/kotlin/org/ktorm/entity/EntityImplementation.kt b/ktorm-core/src/main/kotlin/org/ktorm/entity/EntityImplementation.kt
@@ -220,14 +220,14 @@ internal class EntityImplementation(
 
     override fun equals(other: Any?): Boolean {
         return when (other) {
-            is EntityImplementation -> this === other
-            is Entity<*> -> this === other.implementation
+            is EntityImplementation -> values == other.values && entityClass == other.entityClass
+            is Entity<*> -> values == other.implementation.values && entityClass == other.implementation.entityClass
             else -> false
         }
     }
 
     override fun hashCode(): Int {
-        return System.identityHashCode(this)
+        return values.hashCode() + 13 * entityClass.hashCode()
     }
 
     override fun toString(): String {

diff --git a/ktorm-core/src/test/kotlin/org/ktorm/entity/EntityTest.kt b/ktorm-core/src/test/kotlin/org/ktorm/entity/EntityTest.kt
@@ -498,4 +498,39 @@ class EntityTest : BaseTest() {
         employee = database.employees.find { it.id eq employee.id } ?: throw AssertionError()
         assert(employee.job == "engineer")
     }
+
+    @Test
+    fun testValueEquality() {
+        val now = LocalDate.now()
+        val employee1 = Employee {
+            id = 1
+            name = "Eric"
+            job = "contributor"
+            hireDate = now
+            salary = 50
+        }
+
+        val employee2 = Employee {
+            id = 1
+            name = "Eric"
+            job = "contributor"
+            hireDate = now
+            salary = 50
+        }
+
+        assert(employee1 == employee2)
+    }
+
+    @Test
+    fun testDifferentClassesSameValuesNotEqual() {
+        val employee = Employee {
+            name = "name"
+        }
+
+        val department = Department {
+            name = "name"
+        }
+
+        assert(employee != department)
+    }
 }