borinquenkid commented on code in PR #15568:
URL: https://github.com/apache/grails-core/pull/15568#discussion_r3453915698
##########
grails-data-hibernate7/core/src/main/groovy/grails/gorm/hibernate/HibernateEntity.groovy:
##########
Review Comment:
Will revert the method renames and check the javadoc.
##########
grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy:
##########
@@ -19,45 +19,40 @@
package grails.gorm.tests
-import static grails.gorm.hibernate.mapping.MappingBuilder.define
-
import grails.gorm.annotation.Entity
-import grails.gorm.transactions.Rollback
-import org.grails.orm.hibernate.HibernateDatastore
-import org.springframework.transaction.PlatformTransactionManager
-import spock.lang.AutoCleanup
-import spock.lang.Shared
-import spock.lang.Specification
+
+import static grails.gorm.hibernate.mapping.MappingBuilder.define
/**
* Created by graemerocher on 26/01/2017.
*/
-class CompositeIdWithJoinTableSpec extends Specification {
-
- @AutoCleanup @Shared HibernateDatastore datastore = new
HibernateDatastore(CompositeIdParent, CompositeIdChild)
- @Shared PlatformTransactionManager transactionManager =
datastore.transactionManager
+class CompositeIdWithJoinTableSpec extends HibernateGormDatastoreSpec {
+ def setupSpec() {
+ manager.registerDomainClasses(CompositeIdParent, CompositeIdChild)
+ }
- @Rollback
+ // @Rollback
void "test composite id with join table"() {
- when:"A parent with a composite id and a join table is saved"
- new CompositeIdParent(name: "Test" , last:"Test 2")
- .addToChildren(new CompositeIdChild())
- .save(flush:true)
+ when: "A parent with a composite id and a join table is saved"
+ new CompositeIdParent(name: "Test", last: "Test 2")
+ .addToChildren(new CompositeIdChild(foo: "bar"))
+ .save(flush: true)
- then:"The entity was saved"
+ then: "The entity was saved"
CompositeIdParent.count() == 1
CompositeIdParent.list().first().children.size() == 1
}
}
@Entity
-class CompositeIdParent implements Serializable {
+class CompositeIdParent implements Serializable, Comparable<CompositeIdParent>
{
Review Comment:
Will check and explain.
##########
grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy:
##########
@@ -20,52 +20,209 @@ package grails.gorm.tests
import grails.gorm.annotation.Entity
import grails.gorm.transactions.Rollback
-import org.grails.orm.hibernate.HibernateDatastore
-import org.springframework.transaction.PlatformTransactionManager
-import spock.lang.AutoCleanup
-import spock.lang.Shared
-import spock.lang.Specification
+import jakarta.persistence.Enumerated
+import jakarta.persistence.EnumType
+import org.grails.orm.hibernate.cfg.IdentityEnumType
+import org.hibernate.HibernateException
+import org.hibernate.MappingException
+import org.hibernate.engine.spi.SharedSessionContractImplementor
import javax.sql.DataSource
import java.sql.ResultSet
/**
- * Created by graemerocher on 16/11/16.
+ * Tests for IdentityEnumType in Hibernate 5.
*/
-class IdentityEnumTypeSpec extends Specification {
+class IdentityEnumTypeSpec extends HibernateGormDatastoreSpec {
- @Shared @AutoCleanup HibernateDatastore hibernateDatastore = new
HibernateDatastore(EnumEntityDomain, FooWithEnum)
- @Shared PlatformTransactionManager transactionManager =
hibernateDatastore.getTransactionManager()
+ def setupSpec() {
+ manager.registerDomainClasses(EnumEntityDomain, FooWithEnum)
+ }
@Rollback
void "test identity enum type"() {
when:
- new EnumEntityDomain(status:
EnumEntityDomain.Status.FOO).save(flush:true)
- DataSource ds =
hibernateDatastore.connectionSources.defaultConnectionSource.dataSource
+ new EnumEntityDomain(status: EnumEntityDomain.Status.FOO).save(flush:
true)
+ DataSource ds =
manager.hibernateDatastore.connectionSources.defaultConnectionSource.dataSource
ResultSet resultSet = ds.getConnection().prepareStatement('select
status from enum_entity_domain').executeQuery()
then:
resultSet.next()
- resultSet.getString(1) == 'F'
+ resultSet.getString(1) == 'F' // FOO id is 'F'
EnumEntityDomain.first().status == EnumEntityDomain.Status.FOO
}
@Rollback
void "test identity enum type 2"() {
when:
- new FooWithEnum(name: "blah", mySuperValue:
XEnum.X__TWO).save(flush:true)
- DataSource ds =
hibernateDatastore.connectionSources.defaultConnectionSource.dataSource
+ new FooWithEnum(name: "blah", mySuperValue: XEnum.X__TWO).save(flush:
true)
+ DataSource ds =
manager.hibernateDatastore.connectionSources.defaultConnectionSource.dataSource
ResultSet resultSet = ds.getConnection().prepareStatement('select
my_super_value from foo_with_enum').executeQuery()
then:
resultSet.next()
- resultSet.getInt(1) == 100
+ resultSet.getInt(1) == 100 // X__TWO id is 100
FooWithEnum.first().mySuperValue == XEnum.X__TWO
}
+
+ def "setParameterValues initializes enumClass"() {
+ given:
+ def type = new IdentityEnumType()
+ def props = new Properties()
+ props.setProperty(IdentityEnumType.PARAM_ENUM_CLASS,
IdentityStatusEnum.name)
+
+ when:
+ type.setParameterValues(props)
+
+ then:
+ type.returnedClass() == IdentityStatusEnum
+ type.sqlTypes()[0] != 0
+ }
+
+ def "setParameterValues throws MappingException for enum without getId
method"() {
+ given:
+ def type = new IdentityEnumType()
+ def props = new Properties()
+ props.setProperty(IdentityEnumType.PARAM_ENUM_CLASS, PlainEnum.name)
+
+ when:
+ type.setParameterValues(props)
+
+ then:
+ thrown(HibernateException) // Throw by BidiEnumMap constructor
+ }
+
+ def "equals uses identity comparison"() {
+ given:
+ def type = new IdentityEnumType()
+
+ expect:
+ type.equals(IdentityStatusEnum.ACTIVE, IdentityStatusEnum.ACTIVE)
+ !type.equals(IdentityStatusEnum.ACTIVE, IdentityStatusEnum.INACTIVE)
+ !type.equals(null, IdentityStatusEnum.ACTIVE)
+ }
+
+ def "hashCode delegates to the object"() {
+ given:
+ def type = new IdentityEnumType()
+ def val = IdentityStatusEnum.ACTIVE
+
+ expect:
+ type.hashCode(val) == val.hashCode()
+ }
+
+ def "deepCopy returns the same object reference"() {
+ given:
+ def type = new IdentityEnumType()
+ def val = IdentityStatusEnum.ACTIVE
+
+ expect:
+ type.deepCopy(val).is(val)
+ }
+
+ def "isMutable returns false"() {
+ expect:
+ !new IdentityEnumType().isMutable()
+ }
+
+ def "disassemble returns the value as Serializable"() {
+ given:
+ def type = new IdentityEnumType()
+ def val = IdentityStatusEnum.ACTIVE
+
+ expect:
+ type.disassemble(val).is(val)
+ }
+
+ def "assemble returns the cached value unchanged"() {
+ given:
+ def type = new IdentityEnumType()
+ def val = IdentityStatusEnum.ACTIVE
+
+ expect:
+ type.assemble(val, null).is(val)
+ }
+
+ def "replace returns the original value"() {
+ given:
+ def type = new IdentityEnumType()
+
+ expect:
+ type.replace(IdentityStatusEnum.ACTIVE, IdentityStatusEnum.INACTIVE,
null).is(IdentityStatusEnum.ACTIVE)
+ }
+
+ def "nullSafeGet returns null for null value"() {
+ given:
+ def type = new IdentityEnumType()
+ def props = new Properties()
+ props.setProperty(IdentityEnumType.PARAM_ENUM_CLASS,
IdentityStatusEnum.name)
+ type.setParameterValues(props)
+ def rs = Mock(java.sql.ResultSet)
+ def session = manager.sessionFactory.currentSession as
SharedSessionContractImplementor
+
+ when:
+ def res = type.nullSafeGet(rs, ['status'] as String[], session, null)
+
+ then:
+ 1 * rs.getString('status') >> null
+ 1 * rs.wasNull() >> true
+ res == null
+ }
+
+ def "nullSafeGet converts id to enum"() {
+ given:
+ def type = new IdentityEnumType()
+ def props = new Properties()
+ props.setProperty(IdentityEnumType.PARAM_ENUM_CLASS,
IdentityStatusEnum.name)
+ type.setParameterValues(props)
+ def rs = Mock(java.sql.ResultSet)
+ def session = manager.sessionFactory.currentSession as
SharedSessionContractImplementor
+
+ when:
+ def res = type.nullSafeGet(rs, ['status'] as String[], session, null)
+
+ then:
+ 1 * rs.getString('status') >> "A"
+ 2 * rs.wasNull() >> false
+ res == IdentityStatusEnum.ACTIVE
+ }
+
+ def "nullSafeSet handles null value"() {
+ given:
+ def type = new IdentityEnumType()
+ def props = new Properties()
+ props.setProperty(IdentityEnumType.PARAM_ENUM_CLASS,
IdentityStatusEnum.name)
+ type.setParameterValues(props)
+ def st = Mock(java.sql.PreparedStatement)
+ def session = manager.sessionFactory.currentSession as
SharedSessionContractImplementor
+
+ when:
+ type.nullSafeSet(st, null, 1, session)
+
+ then:
+ 1 * st.setNull(1, _)
+ }
+
+ def "nullSafeSet converts enum to id"() {
+ given:
+ def type = new IdentityEnumType()
+ def props = new Properties()
+ props.setProperty(IdentityEnumType.PARAM_ENUM_CLASS,
IdentityStatusEnum.name)
+ type.setParameterValues(props)
+ def st = Mock(java.sql.PreparedStatement)
+ def session = manager.sessionFactory.currentSession as
SharedSessionContractImplementor
+
+ when:
+ type.nullSafeSet(st, IdentityStatusEnum.INACTIVE, 1, session)
+
+ then:
+ 1 * st.setString(1, "I")
+ }
}
@Entity
class EnumEntityDomain {
+ @Enumerated(EnumType.STRING)
Review Comment:
Will address — annotations will be moved to the H7 module.
##########
grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy:
##########
@@ -83,18 +240,19 @@ class EnumEntityDomain {
class FooWithEnum {
long id
String name
+ @Enumerated(EnumType.STRING)
Review Comment:
Same.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
