[teiid-commits] teiid SVN: r2814 - in branches/7.1.x: metadata/src/main/java/org/teiid/metadata/index and 2 other directories.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2011-01-04 14:40:39 -0500 (Tue, 04 Jan 2011)
New Revision: 2814

Added:
   branches/7.1.x/metadata/src/test/resources/Test.vdb
Modified:
   branches/7.1.x/api/src/main/java/org/teiid/metadata/Schema.java
   branches/7.1.x/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java
   branches/7.1.x/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java
Log:
TEIID-1418 updated the metadata search filter to load tables correctly

Modified: branches/7.1.x/api/src/main/java/org/teiid/metadata/Schema.java
===================================================================
--- branches/7.1.x/api/src/main/java/org/teiid/metadata/Schema.java	2011-01-03 22:46:11 UTC (rev 2813)
+++ branches/7.1.x/api/src/main/java/org/teiid/metadata/Schema.java	2011-01-04 19:40:39 UTC (rev 2814)
@@ -38,7 +38,9 @@
 	
 	public void addTable(Table table) {
 		table.setParent(this);
-		this.tables.put(table.getName().toLowerCase(), table);
+		if (this.tables.put(table.getName().toLowerCase(), table) != null) {
+			throw new AssertionError("Duplicate Table " + table.getName()); //$NON-NLS-1$
+		}
 	}
 	
 	public void addProcedure(Procedure procedure) {

Modified: branches/7.1.x/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java
===================================================================
--- branches/7.1.x/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java	2011-01-03 22:46:11 UTC (rev 2813)
+++ branches/7.1.x/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java	2011-01-04 19:40:39 UTC (rev 2814)
@@ -603,7 +603,7 @@
      * recordType|pathInModel|UUID|nameInSource|parentObjectID|
      * @param name The partially/fully qualified name for which
      * the pattern match string is to be constructed.
-     * @return The pattern match string of the form: recordType|*name|* 
+     * @return The pattern match string of the form: recordType|name|* 
      */
     private String getMatchPattern(final char recordType, final String name) {
         ArgCheck.isNotNull(name);
@@ -611,8 +611,7 @@
         // construct the pattern string
         String patternStr = "" //$NON-NLS-1$
                           + recordType
-                          + IndexConstants.RECORD_STRING.RECORD_DELIMITER
-                          + IndexConstants.RECORD_STRING.MATCH_CHAR;
+                          + IndexConstants.RECORD_STRING.RECORD_DELIMITER;
         if(name != null) {
             patternStr =  patternStr + name.trim().toUpperCase()
                           + IndexConstants.RECORD_STRING.RECORD_DELIMITER

Modified: branches/7.1.x/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java
===================================================================
--- branches/7.1.x/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java	2011-01-03 22:46:11 UTC (rev 2813)
+++ branches/7.1.x/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java	2011-01-04 19:40:39 UTC (rev 2814)
@@ -42,8 +42,16 @@
 		assertEquals(1, names.size());
 		
 		//ensure that datatypes are set
-		Table t = (Table)tm.getGroupID(names.iterator().next());
+		Table t = tm.getGroupID(names.iterator().next());
 		assertNotNull(t.getColumns().get(0).getDatatype());
 	}
 	
+	@Test public void testSchemaLoad() throws Exception {
+		TransformationMetadata tm = VDBMetadataFactory.getVDBMetadata(UnitTestUtil.getTestDataPath() + "/Test.vdb");
+		
+		//ensure that datatypes are set
+		Table t = tm.getGroupID("Northwind.Northwind.dbo.Employees");
+		assertFalse(t.isVirtual());
+	}
+	
 }

Added: branches/7.1.x/metadata/src/test/resources/Test.vdb
===================================================================
(Binary files differ)


Property changes on: branches/7.1.x/metadata/src/test/resources/Test.vdb
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream