diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/DdlTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/DdlTypeImpl.java
index 4a7c0d56fe..e90b444e7d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/DdlTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/DdlTypeImpl.java
@@ -114,13 +114,15 @@ public class DdlTypeImpl implements DdlType {
 		}
 		else {
 			//use the given length/precision/scale
-			if ( precision != null && scale == null ) {
+			final Size size = dialect.getSizeStrategy()
+					.resolveSize( jdbcType, javaType, precision, scale, length );
+			if ( size.getPrecision() != null && size.getScale() == null ) {
 				//needed for cast(x as BigInteger(p))
-				scale = javaType.getDefaultSqlScale( dialect, jdbcType );
+				size.setScale( javaType.getDefaultSqlScale( dialect, jdbcType ) );
 			}
 			return castTypeNamePattern == null
-					? getTypeName( length, precision, scale )
-					: replace( castTypeNamePattern, length, precision, scale );
+					? getTypeName( size.getLength(), size.getPrecision(), size.getScale() )
+					: replace( castTypeNamePattern, size.getLength(), size.getPrecision(), size.getScale() );
 		}
 	}
 
diff --git a/hibernate-core/src/test/resources/mappings/subselectfetch/Name.hbm.xml b/hibernate-core/src/test/resources/mappings/subselectfetch/Name.hbm.xml
index b5ef91f866..ab1594ef85 100644
--- a/hibernate-core/src/test/resources/mappings/subselectfetch/Name.hbm.xml
+++ b/hibernate-core/src/test/resources/mappings/subselectfetch/Name.hbm.xml
@@ -12,10 +12,10 @@
 <hibernate-mapping>
 
   <class name="org.hibernate.orm.test.mapping.fetch.subselect.Name" table="T_Name">
-    <id name="id" column="id"/>
+    <id name="id" column="c_id"/>
     <property  name="name" column="c_name"/>
 
-    <property name="nameLength" formula="(select length(c_name) from T_Name where id = T_Name.id)"/>
+    <property name="nameLength" formula="(select length(sub.c_name) from T_Name sub where c_id = sub.c_id)"/>
 
     <bag name="values" inverse="true" lazy="false" fetch="subselect">
       <key column="name_id"/>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/bidi/Auction.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/bidi/Auction.hbm.xml
index 13b474ab79..fdd58269e8 100644
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/bidi/Auction.hbm.xml
+++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/bidi/Auction.hbm.xml
@@ -13,7 +13,7 @@
 	package="org.hibernate.orm.test.bidi">
 
 	<class name="Auction" table="TAuction">
-		<id name="id">
+		<id name="id" column="c_id">
 			<generator class="native"/>
 		</id>
 		<property name="description"/>
@@ -25,13 +25,13 @@
 		</bag>
 		<one-to-one name="successfulBid"
 				property-ref="abc">
-			<formula>id</formula>
+			<formula>c_id</formula>
 			<formula>true</formula>
 		</one-to-one>
 	</class>
 	
 	<class name="Bid" table="TBid">
-		<id name="id">
+		<id name="id" column="c_id">
 			<generator class="native"/>
 		</id>
 		<property name="amount" 
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/bidi/Auction2.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/bidi/Auction2.hbm.xml
index 77eca851c3..a9653b90e6 100644
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/bidi/Auction2.hbm.xml
+++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/bidi/Auction2.hbm.xml
@@ -13,7 +13,7 @@
 	package="org.hibernate.orm.test.bidi">
 
 	<class name="Auction" table="TAuction2">
-		<id name="id">
+		<id name="id" column="c_id">
 			<generator class="native"/>
 		</id>
 		<property name="description"/>
@@ -27,7 +27,7 @@
 	</class>
 	
 	<class name="Bid" table="TBid2">
-		<id name="id">
+		<id name="id" column="c_id">
 			<generator class="native"/>
 		</id>
 		<property name="amount" scale="19" precision="31"/>
@@ -37,7 +37,7 @@
 				column="auctionId" 
 				cascade="persist"/>
 		<property name="successful">
-			<formula>exists(select a.id from TAuction2 a where a.successfulBid=id)</formula>
+			<formula>exists(select a.c_id from TAuction2 a where a.successfulBid=c_id)</formula>
 		</property>
 	</class>
 
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/bidi/Auction3.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/bidi/Auction3.hbm.xml
index b2e164be36..1861b04576 100644
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/bidi/Auction3.hbm.xml
+++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/bidi/Auction3.hbm.xml
@@ -13,7 +13,7 @@
         package="org.hibernate.orm.test.bidi">
 
     <class name="SpecialAuction" table="TAuction">
-        <id name="id">
+        <id name="id" column="c_id">
             <generator class="native"/>
         </id>
         <property name="description"/>
@@ -25,13 +25,13 @@
         </bag>
         <one-to-one name="successfulBid"
                     property-ref="abc">
-            <formula>id</formula>
+            <formula>c_id</formula>
             <formula>true</formula>
         </one-to-one>
     </class>
 
     <class name="AbstractBid" table="TBid" abstract="true">
-        <id name="id">
+        <id name="id" column="c_id">
             <generator class="native"/>
         </id>