Author: shawkins
Date: 2011-05-11 09:59:23 -0400 (Wed, 11 May 2011)
New Revision: 3163
Modified:
branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCMetdataProcessor.java
branches/7.4.x/test-integration/common/src/test/java/org/teiid/jdbc/TestDymamicImportedMetaData.java
Log:
TEIID-1583 changing the default to match the docs
Modified:
branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCMetdataProcessor.java
===================================================================
---
branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCMetdataProcessor.java 2011-05-10
19:53:41 UTC (rev 3162)
+++
branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCMetdataProcessor.java 2011-05-11
13:59:23 UTC (rev 3163)
@@ -76,7 +76,7 @@
private boolean importKeys;
private boolean importIndexes;
private String procedureNamePattern;
- private boolean useFullSchemaName;
+ private boolean useFullSchemaName = true;
private String[] tableTypes;
private String tableNamePattern;
private String catalog;
Modified:
branches/7.4.x/test-integration/common/src/test/java/org/teiid/jdbc/TestDymamicImportedMetaData.java
===================================================================
---
branches/7.4.x/test-integration/common/src/test/java/org/teiid/jdbc/TestDymamicImportedMetaData.java 2011-05-10
19:53:41 UTC (rev 3162)
+++
branches/7.4.x/test-integration/common/src/test/java/org/teiid/jdbc/TestDymamicImportedMetaData.java 2011-05-11
13:59:23 UTC (rev 3163)
@@ -64,13 +64,13 @@
@Test public void testProcImport() throws Exception {
FakeServer server = new FakeServer();
- server.deployVDB("test", UnitTestUtil.getTestDataPath() +
"/TestCase3473/test.vdb");
- Connection conn = server.createConnection("jdbc:teiid:test");
//$NON-NLS-1$
+ server.deployVDB("vdb", UnitTestUtil.getTestDataPath() +
"/TestCase3473/test.vdb");
+ Connection conn = server.createConnection("jdbc:teiid:vdb");
//$NON-NLS-1$
Properties importProperties = new Properties();
importProperties.setProperty("importer.importProcedures",
Boolean.TRUE.toString());
MetadataFactory mf = getMetadata(importProperties, conn);
- Procedure p =
mf.getMetadataStore().getSchemas().get("TEST").getProcedures().get("GETXMLSCHEMAS");
+ Procedure p =
mf.getMetadataStore().getSchemas().get("TEST").getProcedures().get("VDB.SYS.GETXMLSCHEMAS");
assertEquals(1, p.getResultSet().getColumns().size());
}
@@ -92,15 +92,17 @@
Connection conn = server.createConnection("jdbc:teiid:test");
//$NON-NLS-1$
Properties importProperties = new Properties();
+
+ getMetadata(importProperties, conn);
+
assertNotNull(mf.getMetadataStore().getSchemas().get("X").getTables().get("DUP"));
+
+ importProperties.setProperty("importer.useFullSchemaName",
Boolean.FALSE.toString());
try {
getMetadata(importProperties, conn);
+ fail();
} catch (TranslatorException e) {
}
-
- importProperties.setProperty("importer.useFullSchemaName",
Boolean.TRUE.toString());
- getMetadata(importProperties, conn);
-
assertNotNull(mf.getMetadataStore().getSchemas().get("X").getTables().get("DUP"));
}
}
Show replies by date