[Hibernate-commits] Hibernate Code SVN: r9838 - in trunk/HibernateExt/metadata/src: java/org/hibernate/cfg test/org/hibernate/test/annotations test/org/hibernate/test/annotations/strategy

[<hib...@li...>]

Author: epbernard
Date: 2006-04-30 15:00:59 -0400 (Sun, 30 Apr 2006)
New Revision: 9838

Modified:
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/IndexSecondPass.java
   trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/EntityTest.java
   trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/Flight.java
   trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/strategy/Storm.java
Log:
ANN-305 indexes used the physical column name rather than logical one

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/IndexSecondPass.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/IndexSecondPass.java	2006-04-30 16:56:11 UTC (rev 9837)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/IndexSecondPass.java	2006-04-30 19:00:59 UTC (rev 9838)
@@ -41,7 +41,7 @@
 		}
 		if ( column != null ) {
 			this.table = column.getTable();
-			addIndexToColumn( column.getName() );
+			addIndexToColumn( mappings.getLogicalColumnName( column.getName(), table ) );
 		}
 	}
 

Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/EntityTest.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/EntityTest.java	2006-04-30 16:56:11 UTC (rev 9837)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/EntityTest.java	2006-04-30 19:00:59 UTC (rev 9838)
@@ -311,6 +311,7 @@
 		airFrance.setDepartureDate( new Date( 05, 06, 21, 10, 0, 0 ) );
 		airFrance.setAlternativeDepartureDate( new GregorianCalendar( 2006, 02, 03, 10, 00 ) );
 		airFrance.getAlternativeDepartureDate().setTimeZone( TimeZone.getTimeZone( "GMT" ) );
+		airFrance.setBuyDate( new java.sql.Timestamp(122367443) );
 		airFrance.setFactor( 25 );
 		s.persist( airFrance );
 		tx.commit();
@@ -326,6 +327,7 @@
 				new Date( 05, 06, 21 ),
 				copyAirFrance.getDepartureDate()
 		);
+		assertEquals( airFrance.getBuyDate(), copyAirFrance.getBuyDate());
 		s.delete( copyAirFrance );
 		tx.commit();
 		s.close();

Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/Flight.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/Flight.java	2006-04-30 16:56:11 UTC (rev 9837)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/Flight.java	2006-04-30 19:00:59 UTC (rev 9838)
@@ -36,6 +36,7 @@
 	String triggeredData;
 	long factor;
 	Date departureDate;
+	java.sql.Timestamp buyDate;
 	Calendar alternativeDepartureDate;
 
 	@Id
@@ -137,4 +138,12 @@
 		this.alternativeDepartureDate = alternativeDepartureDate;
 	}
 
+	public java.sql.Timestamp getBuyDate() {
+		return buyDate;
+	}
+
+	public void setBuyDate(java.sql.Timestamp buyDate) {
+		this.buyDate = buyDate;
+	}
+
 }
\ No newline at end of file

Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/strategy/Storm.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/strategy/Storm.java	2006-04-30 16:56:11 UTC (rev 9837)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/strategy/Storm.java	2006-04-30 19:00:59 UTC (rev 9838)
@@ -1,13 +1,16 @@
 //$Id$
 package org.hibernate.test.annotations.strategy;
 
+import javax.persistence.Column;
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.UniqueConstraint;
 import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
 
+import org.hibernate.annotations.Index;
+
 /**
  * @author Emmanuel Bernard
  */
@@ -17,6 +20,7 @@
 	private Integer id;
 	private Location start;
 	private Location end;
+	private String stormName;
 
 	@Id
 	@GeneratedValue
@@ -45,4 +49,14 @@
 	public void setEnd(Location end) {
 		this.end = end;
 	}
+
+	@Index(name="storm_name_idx")
+	@Column(unique = true)
+	public String getStormName() {
+		return stormName;
+	}
+
+	public void setStormName(String name) {
+		this.stormName = name;
+	}
 }