[Hibernate-commits] HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg CompositeIdTest.java,1.13,1.14 overridetest.reveng.xml,1.13,1.14 OverrideBinderTest.java,1.22,1.23

[<max...@us...>]

Update of /cvsroot/hibernate/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15356/src/test/org/hibernate/tool/test/jdbc2cfg

Modified Files:
	CompositeIdTest.java overridetest.reveng.xml 
	OverrideBinderTest.java 
Log Message:
HBX-574 column exclude 
+ fixed some tests

Index: CompositeIdTest.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/CompositeIdTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- CompositeIdTest.java	7 Feb 2006 14:02:15 -0000	1.13
+++ CompositeIdTest.java	23 Feb 2006 18:05:21 -0000	1.14
@@ -247,7 +247,7 @@
         SessionFactory factory = derived.buildSessionFactory();
         Session session = factory.openSession();
         
-        executeDDL(getGenDataSQL() );
+        executeDDL(getGenDataSQL(), false);
         session.createQuery("from Lineitem").list();
         List list = session.createQuery("from Product").list();
         assertEquals(2,list.size() );

Index: overridetest.reveng.xml
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/overridetest.reveng.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- overridetest.reveng.xml	31 Oct 2005 12:46:55 -0000	1.13
+++ overridetest.reveng.xml	23 Feb 2006 18:05:21 -0000	1.14
@@ -62,6 +62,10 @@
 		</foreign-key>
 	</table>
 
+    <table name="EXCOLUMNS">
+    	<column name="EXCOLUMN" exclude="true"/>
+    </table>
+    
    <table name="TblTest" class="org.test.Test"/>
    		
 

Index: OverrideBinderTest.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OverrideBinderTest.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- OverrideBinderTest.java	27 Jan 2006 10:20:14 -0000	1.22
+++ OverrideBinderTest.java	23 Feb 2006 18:05:21 -0000	1.23
@@ -21,6 +21,7 @@
 import org.hibernate.cfg.reveng.SQLTypeMapping;
 import org.hibernate.cfg.reveng.TableFilter;
 import org.hibernate.cfg.reveng.TableIdentifier;
+import org.hibernate.mapping.Column;
 import org.hibernate.mapping.ForeignKey;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
@@ -266,6 +267,25 @@
 		assertTrue(tf.exclude(new TableIdentifier("heremaxsub") ).booleanValue() );
 	}
 	
+	public void testColumnExclude() {
+		
+		OverrideRepository or = buildOverrideRepository();
+		or.addResource(OVERRIDETEST_REVENG_XML);
+		
+		ReverseEngineeringStrategy reverseEngineeringStrategy = or.getReverseEngineeringStrategy();
+		
+		assertFalse(reverseEngineeringStrategy.excludeColumn(new TableIdentifier("EXCOLUMNS"), "blah"));
+		assertFalse(reverseEngineeringStrategy.excludeColumn(new TableIdentifier("EXCOLUMNS"), "NAME"));
+		assertTrue(reverseEngineeringStrategy.excludeColumn(new TableIdentifier("EXCOLUMNS"), "EXCOLUMN"));
+		
+		Table table = findTable(identifier("excolumns"));
+		assertNotNull(table);
+		
+		assertNotNull(table.getColumn(new Column("name")));
+		assertNull(table.getColumn(new Column("excolumn")));
+		
+	}
+	
 	public void testSimpleUserDefinedForeignKeys() {
 		
 		Table table = findTable(identifier("Orders") );
@@ -350,13 +370,15 @@
                 "create table customer ( custid varchar(10), name varchar(20) )",
                 "create table orders ( orderid varchar(10), name varchar(20),  custid varchar(10), completed numeric(1) not null, verified numeric(1), primary key (orderid) )",
                 "create table parent ( id varchar(10), name varchar(20))",
-                "create table children ( id varchar(10), parentid varchar(10), name varchar(20) )"
+                "create table children ( id varchar(10), parentid varchar(10), name varchar(20) )",
+                "create table excolumns (id varchar(12), name varchar(20), excolumn numeric(10,0) )"
 		};
 	}
 
 	protected String[] getDropSQL() {
 		
 		return new String[]  {
+				"drop table excolumns",
 				"drop table parent",
 				"drop table children",
 				"drop table customer",