Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:hibernate/hibernate-core

This commit is contained in:
Steve Ebersole 2011-02-10 09:41:34 -06:00
parent ef301deadc 2a0309c3d0
commit ac27759f2e
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -24,6 +24,7 @@ atlassian-ide-plugin.xml
.project .project
.settings .settings
.metadata .metadata
*/bin
# NetBeans specific files/directories # NetBeans specific files/directories
.nbattrs .nbattrs

4
hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java
View File

@ -221,4 +221,8 @@ public class DerbyDialect extends DB2Dialect {
public boolean supportsLobValueChangePropogation() { public boolean supportsLobValueChangePropogation() {
return false; return false;
} }
public boolean supportsUnboundedLobLocatorMaterialization() {
return false;
}
} }

10
hibernate-core/src/main/java/org/hibernate/dialect/TypeNames.java
View File

@ -73,7 +73,7 @@ public class TypeNames {
* @return the default type name associated with specified key * @return the default type name associated with specified key
*/ */
public String get(int typecode) throws MappingException { public String get(int typecode) throws MappingException {
String result = defaults.get( new Integer(typecode) ); String result = defaults.get( typecode );
if (result==null) throw new MappingException("No Dialect mapping for JDBC type: " + typecode); if (result==null) throw new MappingException("No Dialect mapping for JDBC type: " + typecode);
return result; return result;
} }
@ -88,7 +88,7 @@ public class TypeNames {
* if available and the default type name otherwise * if available and the default type name otherwise
*/ */
public String get(int typecode, int size, int precision, int scale) throws MappingException { public String get(int typecode, int size, int precision, int scale) throws MappingException {
Map<Integer, String> map = weighted.get( new Integer(typecode) ); Map<Integer, String> map = weighted.get( typecode );
if ( map!=null && map.size()>0 ) { if ( map!=null && map.size()>0 ) {
// iterate entries ordered by capacity to find first fit // iterate entries ordered by capacity to find first fit
for (Map.Entry<Integer, String> entry: map.entrySet()) { for (Map.Entry<Integer, String> entry: map.entrySet()) {
@ -111,10 +111,10 @@ public class TypeNames {
* @param typecode the type key * @param typecode the type key
*/ */
public void put(int typecode, int capacity, String value) { public void put(int typecode, int capacity, String value) {
Map<Integer, String> map = weighted.get( new Integer(typecode) ); Map<Integer, String> map = weighted.get( typecode );
if (map == null) {// add new ordered map if (map == null) {// add new ordered map
map = new TreeMap<Integer, String>(); map = new TreeMap<Integer, String>();
weighted.put( new Integer(typecode), map ); weighted.put( typecode, map );
} }
map.put(new Integer(capacity), value); map.put(new Integer(capacity), value);
} }
@ -124,7 +124,7 @@ public class TypeNames {
* @param typecode the type key * @param typecode the type key
*/ */
public void put(int typecode, String value) { public void put(int typecode, String value) {
defaults.put( new Integer(typecode), value ); defaults.put( typecode, value );
} }
} }

2
hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
View File

@ -1160,7 +1160,7 @@ public abstract class AbstractEntityPersister
return select.addCondition( rootTableKeyColumnNames, "=?" ).toStatementString(); return select.addCondition( rootTableKeyColumnNames, "=?" ).toStatementString();
} }
protected boolean[] getPropertyUniqueness() { public boolean[] getPropertyUniqueness() {
return propertyUniqueness; return propertyUniqueness;
} }