Skip to content

Column mapping fixes #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Column mapping fixes #7

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
32b1138
Add column mapping where it is needed
lvojnovic Feb 20, 2015
4678b12
unique constraint uses property name instead of column name
lvojnovic Feb 20, 2015
1fab474
tabs instead of spaces for code I added
lvojnovic Feb 20, 2015
8d3a434
add special mapping when foreign key is also a primary key
lvojnovic Feb 20, 2015
6b7168c
DRY
lvojnovic Feb 20, 2015
bc61fe7
fix error that adds insertable:false for identifier named other than …
lvojnovic Feb 25, 2015
2ac5b93
don't add column mapping when prop name is camel case of column name
lvojnovic Feb 25, 2015
7e4f481
remove ;
lvojnovic Feb 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
don't add column mapping when prop name is camel case of column name
  • Loading branch information
@lvojnovic
lvojnovic committed Feb 26, 2015
commit 2ac5b93e0d07331088e46115a2dd91debd9acc9c
11 changes: 9 additions & 2 deletions src/groovy/grails/plugin/reveng/GrailsEntityPOJOClass.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
*/
package grails.plugin.reveng

import java.beans.Introspector;

import org.hibernate.cfg.Configuration
import org.hibernate.cfg.reveng.ReverseEngineeringStrategyUtil
import org.hibernate.mapping.Column
import org.hibernate.mapping.ForeignKey
import org.hibernate.mapping.ManyToOne
Expand Down Expand Up @@ -551,12 +554,16 @@ class GrailsEntityPOJOClass extends EntityPOJOClass {
mapping.append renderWhenForeignKeyIsAlsoAPrimaryKey(column, property)
}

def properName = { String columnName ->
Introspector.decapitalize( ReverseEngineeringStrategyUtil.toUpperCamelCase(columnName) )
}

getAllPropertiesIterator().each { Property property ->
appender(property, {p, c -> p.name != c.name})
appender(property, {p, c -> p.name != properName(c.name)})
}

newProperties.each { Property property ->
appender(property, {p, c -> p.name + '_id' != c.name})
appender(property, {p, c -> p.name + 'Id' != properName(c.name)})
}

mapping.toString()
Expand Down