July 2012 - teiid-commits - Jboss List Archives

teiid SVN: r4252 - in trunk/jboss-integration/src: test/java/org/teiid/jboss and 1 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2012-07-20 15:20:16 -0400 (Fri, 20 Jul 2012) New Revision: 4252 Modified: trunk/jboss-integration/src/main/resources/schema/jboss-teiid.xsd trunk/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidConfiguration.java trunk/jboss-integration/src/test/resources/teiid-transport-config.txt Log: TEIID-2108 correcting the other ssl defaults Modified: trunk/jboss-integration/src/main/resources/schema/jboss-teiid.xsd =================================================================== --- trunk/jboss-integration/src/main/resources/schema/jboss-teiid.xsd 2012-07-20 17:59:38 UTC (rev 4251) +++ trunk/jboss-integration/src/main/resources/schema/jboss-teiid.xsd 2012-07-20 19:20:16 UTC (rev 4252) @@ -338,13 +338,13 @@ </xs:complexType> </xs:element> </xs:sequence> - <xs:attribute name="mode" default="disabled"> + <xs:attribute name="mode" default="login"> <xs:annotation> <xs:documentation>can be one of disabled, login, or enabled disabled = no transport or message level security will be used login = only the login traffic will be encrypted at a message level using 128 bit AES with an ephemerial DH key exchange. - No other config values are needed in this mode + No other config values are needed in this mode; and it only applies to the JDBC transport enabled = traffic will be secured using this configuration</xs:documentation> </xs:annotation> <xs:simpleType> @@ -355,7 +355,7 @@ </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute name="authentication-mode" default="anonymous"> + <xs:attribute name="authentication-mode" default="1-way"> <xs:annotation> <xs:documentation>1-way, 2-way, anonymous</xs:documentation> </xs:annotation> @@ -367,7 +367,7 @@ </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute name="ssl-protocol" type="xs:string"/> + <xs:attribute name="ssl-protocol" type="xs:string" default="TLSv1"/> <xs:attribute name="keymanagement-algorithm" type="xs:string"/> <xs:attribute name="enable" type="xs:boolean"/> </xs:complexType> Modified: trunk/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidConfiguration.java =================================================================== --- trunk/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidConfiguration.java 2012-07-20 17:59:38 UTC (rev 4251) +++ trunk/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidConfiguration.java 2012-07-20 19:20:16 UTC (rev 4252) @@ -126,7 +126,6 @@ private void validate(String marshalled) throws SAXException, IOException { URL xsdURL = Thread.currentThread().getContextClassLoader().getResource("schema/jboss-teiid.xsd"); - System.out.println(marshalled); SchemaFactory factory = SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema"); Schema schema = factory.newSchema(xsdURL); Modified: trunk/jboss-integration/src/test/resources/teiid-transport-config.txt =================================================================== --- trunk/jboss-integration/src/test/resources/teiid-transport-config.txt 2012-07-20 17:59:38 UTC (rev 4251) +++ trunk/jboss-integration/src/test/resources/teiid-transport-config.txt 2012-07-20 19:20:16 UTC (rev 4252) @@ -66,13 +66,13 @@ "type" => STRING, "description" => "Authentication Mode (1-way, 2-way, anonymous) ", "required" => false, - "default" => "anonymous" + "default" => "1-way" }, "ssl-ssl-protocol" => { "type" => STRING, "description" => "SSL protocol used", "required" => false, - "default" => "SSLv3" + "default" => "TLSv1" }, "ssl-keymanagement-algorithm" => { "type" => STRING,

10 years, 4 months

1
0
0 / 0

teiid SVN: r4251 - trunk/jboss-integration/src/main/java/org/teiid/jboss.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2012-07-20 13:59:38 -0400 (Fri, 20 Jul 2012) New Revision: 4251 Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/Element.java Log: TEIID-2108 correcting the other ssl defaults Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/Element.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/Element.java 2012-07-20 17:43:12 UTC (rev 4250) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/Element.java 2012-07-20 17:59:38 UTC (rev 4251) @@ -32,6 +32,8 @@ import org.jboss.dmr.ModelNode; import org.jboss.dmr.ModelType; import org.teiid.core.TeiidRuntimeException; +import org.teiid.net.socket.SocketUtil; +import org.teiid.transport.SSLConfiguration; @SuppressWarnings("nls") enum Element { @@ -108,9 +110,9 @@ PG_MAX_LOB_SIZE_ALLOWED_ELEMENT("max-lob-size-in-bytes", "pg-max-lob-size-in-bytes", ModelType.INT, false, "5242880"), //$NON-NLS-1$ //$NON-NLS-2$ SSL_ELEMENT("ssl"), - SSL_MODE_ATTRIBUTE("mode", "ssl-mode", ModelType.STRING, false, "login"), - SSL_AUTH_MODE_ATTRIBUTE("authentication-mode", "ssl-authentication-mode", ModelType.STRING, false, "anonymous"), - SSL_SSL_PROTOCOL_ATTRIBUTE("ssl-protocol", "ssl-ssl-protocol", ModelType.STRING, false, "SSLv3"), + SSL_MODE_ATTRIBUTE("mode", "ssl-mode", ModelType.STRING, false, SSLConfiguration.LOGIN), + SSL_AUTH_MODE_ATTRIBUTE("authentication-mode", "ssl-authentication-mode", ModelType.STRING, false, SSLConfiguration.ONEWAY), + SSL_SSL_PROTOCOL_ATTRIBUTE("ssl-protocol", "ssl-ssl-protocol", ModelType.STRING, false, SocketUtil.DEFAULT_PROTOCOL), SSL_KEY_MANAGEMENT_ALG_ATTRIBUTE("keymanagement-algorithm", "ssl-keymanagement-algorithm", ModelType.STRING, false, null), SSL_ENABLED_CIPHER_SUITES_ATTRIBUTE("enabled-cipher-suites", "enabled-cipher-suites", ModelType.STRING, false, null), SSL_KETSTORE_ELEMENT("keystore"),

10 years, 4 months

1
0
0 / 0

teiid SVN: r4250 - in trunk: build/kits/jboss-as7/standalone/configuration and 1 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2012-07-20 13:43:12 -0400 (Fri, 20 Jul 2012) New Revision: 4250 Modified: trunk/build/kits/jboss-as7/bin/scripts/teiid-domain-mode-install.cli trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java Log: TEIID-2108 one more change related to the ssl mode Modified: trunk/build/kits/jboss-as7/bin/scripts/teiid-domain-mode-install.cli =================================================================== --- trunk/build/kits/jboss-as7/bin/scripts/teiid-domain-mode-install.cli 2012-07-20 17:06:31 UTC (rev 4249) +++ trunk/build/kits/jboss-as7/bin/scripts/teiid-domain-mode-install.cli 2012-07-20 17:43:12 UTC (rev 4250) @@ -18,7 +18,7 @@ /profile=ha/subsystem=teiid:add(async-thread-pool=teiid-async, distributed-cache-jgroups-stack=udp, resultset-cache-infinispan-container=teiid-cache, policy-decider-module=org.jboss.teiid) /profile=ha/subsystem=teiid/transport=embedded:add() -/profile=ha/subsystem=teiid/transport=jdbc:add(protocol=teiid, socket-binding=teiid-jdbc, ssl-mode=login, authentication-security-domain=teiid-security) +/profile=ha/subsystem=teiid/transport=jdbc:add(protocol=teiid, socket-binding=teiid-jdbc, authentication-security-domain=teiid-security) /profile=ha/subsystem=teiid/transport=odbc:add(protocol=pg, socket-binding=teiid-odbc, authentication-security-domain=teiid-security) /profile=ha/subsystem=teiid/translator=jdbc-simple:add(module=org.jboss.teiid.translator.jdbc) Modified: trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml =================================================================== --- trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml 2012-07-20 17:06:31 UTC (rev 4249) +++ trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml 2012-07-20 17:43:12 UTC (rev 4250) @@ -272,7 +272,6 @@ <transport name="embedded"/> <transport name="jdbc" protocol="teiid" socket-binding="teiid-jdbc"> - <ssl mode="login"/> <authentication security-domain="teiid-security"/> </transport> <transport name="odbc" protocol="pg" socket-binding="teiid-odbc"> Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java 2012-07-20 17:06:31 UTC (rev 4249) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java 2012-07-20 17:43:12 UTC (rev 4250) @@ -242,7 +242,6 @@ } SSLConfiguration ssl = new SSLConfiguration(); - ssl.setMode(SSLConfiguration.DISABLED); if (Element.SSL_MODE_ATTRIBUTE.isDefined(node)) { ssl.setMode(Element.SSL_MODE_ATTRIBUTE.asString(node));

10 years, 4 months

1
0
0 / 0

teiid SVN: r4249 - in trunk: admin/src/main/java/org/teiid/adminapi/impl and 22 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2012-07-20 13:06:31 -0400 (Fri, 20 Jul 2012) New Revision: 4249 Added: trunk/test-integration/common/src/test/resources/error-vdb.xml Modified: trunk/admin/src/main/java/org/teiid/adminapi/VDB.java trunk/admin/src/main/java/org/teiid/adminapi/impl/SourceMappingMetadata.java trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataMapper.java trunk/admin/src/test/resources/vdb-describe.txt trunk/api/src/main/java/org/teiid/metadata/MetadataRepository.java trunk/api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFactory.java trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java trunk/api/src/test/java/org/teiid/translator/TestBaseDelegatingExecutionFactory.java trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/translator/yahoo/YahooExecutionFactory.java trunk/connectors/translator-file/src/main/java/org/teiid/translator/file/FileExecutionFactory.java trunk/connectors/translator-olap/src/main/java/org/teiid/translator/olap/OlapExecutionFactory.java trunk/connectors/translator-ws/src/main/java/org/teiid/translator/ws/WSExecutionFactory.java trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManagerRepository.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java trunk/engine/src/main/java/org/teiid/query/metadata/BaseMetadataRepository.java trunk/engine/src/main/java/org/teiid/query/metadata/DDLMetadataRepository.java trunk/engine/src/main/java/org/teiid/query/metadata/NativeMetadataRepository.java trunk/engine/src/main/resources/org/teiid/query/i18n.properties trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java trunk/runtime/src/main/java/org/teiid/deployers/EventDistributorImpl.java trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java trunk/runtime/src/main/java/org/teiid/runtime/AbstractVDBDeployer.java trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java trunk/runtime/src/test/java/org/teiid/services/TestSessionServiceImpl.java trunk/test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestDeployment.java trunk/test-integration/common/src/test/java/org/teiid/arquillian/SampleExecutionFactory.java trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java Log: TEIID-2105 refining vdb handling so that we still track structurally valid deployments in the vdbrepository Modified: trunk/admin/src/main/java/org/teiid/adminapi/VDB.java =================================================================== --- trunk/admin/src/main/java/org/teiid/adminapi/VDB.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/admin/src/main/java/org/teiid/adminapi/VDB.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -48,7 +48,11 @@ /** * In the vdb repository and querable, but not necessarily valid */ - ACTIVE, + ACTIVE, + /** + * A invalid vdb that cannot transition to active + */ + FAILED, REMOVED }; Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/SourceMappingMetadata.java =================================================================== --- trunk/admin/src/main/java/org/teiid/adminapi/impl/SourceMappingMetadata.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/admin/src/main/java/org/teiid/adminapi/impl/SourceMappingMetadata.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -47,11 +47,11 @@ this.name = name; } + /** + * + * @return the jndi name or null if no connection factory is defined + */ public String getConnectionJndiName() { - // this default could be controlled if needed. - if (this.jndiName == null) { - return "java:"+name; //$NON-NLS-1$ - } return jndiName; } @@ -68,6 +68,6 @@ } public String toString() { - return getName()+"/"+getTranslatorName()+"/"+getConnectionJndiName(); //$NON-NLS-1$ //$NON-NLS-2$ + return getName()+", "+getTranslatorName()+", "+getConnectionJndiName(); //$NON-NLS-1$ //$NON-NLS-2$ } } \ No newline at end of file Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java =================================================================== --- trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -77,10 +77,6 @@ return this.status; } - public boolean isLoading() { - return this.status == Status.LOADING; - } - public synchronized void setStatus(Status s) { this.notifyAll(); this.status = s; Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataMapper.java =================================================================== --- trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataMapper.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataMapper.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -214,6 +214,7 @@ ModelNode statusAllowed = new ModelNode(); statusAllowed.add(Status.ACTIVE.toString()); statusAllowed.add(Status.LOADING.toString()); + statusAllowed.add(Status.FAILED.toString()); statusAllowed.add(Status.REMOVED.toString()); addAttribute(node, STATUS, ModelType.STRING, true); node.get(STATUS).get(ALLOWED).set(statusAllowed); @@ -522,7 +523,9 @@ } node.get(SOURCE_NAME).set(source.getName()); - node.get(JNDI_NAME).set(source.getConnectionJndiName()); + if (source.getConnectionJndiName() != null) { + node.get(JNDI_NAME).set(source.getConnectionJndiName()); + } node.get(TRANSLATOR_NAME).set(source.getTranslatorName()); return node; } Modified: trunk/admin/src/test/resources/vdb-describe.txt =================================================================== --- trunk/admin/src/test/resources/vdb-describe.txt 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/admin/src/test/resources/vdb-describe.txt 2012-07-20 17:06:31 UTC (rev 4249) @@ -27,6 +27,7 @@ "allowed" : [ "ACTIVE", "LOADING", + "FAILED", "REMOVED" ] }, Modified: trunk/api/src/main/java/org/teiid/metadata/MetadataRepository.java =================================================================== --- trunk/api/src/main/java/org/teiid/metadata/MetadataRepository.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/api/src/main/java/org/teiid/metadata/MetadataRepository.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -34,8 +34,10 @@ /** * Loads the schema information for the vdb for the given schemaName. Loads table, procedures, functions, indexes etc. * @param factory + * @param executionFactory may be null if loading a virtual source + * @param connectionFactory may be null if source is not available * @return - * @throws TranslatorException + * @throws TranslatorException to indicate a recoverable error, otherwise a RuntimeException */ void loadMetadata(MetadataFactory factory, ExecutionFactory<F, C> executionFactory, F connectionFactory) throws TranslatorException; @@ -112,5 +114,5 @@ * Implementation class must delegete the call to 'next' instance after it is done with the processing of the call. * @param next */ - void setNext(MetadataRepository next); + void setNext(MetadataRepository<?, ?> next); } Modified: trunk/api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFactory.java =================================================================== --- trunk/api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFactory.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFactory.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -439,4 +439,8 @@ throws TranslatorException { return delegate.getCacheDirective(command, executionContext, metadata); } + @Override + public boolean isSourceRequiredForMetadata() { + return delegate.isSourceRequiredForMetadata(); + } } Modified: trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java =================================================================== --- trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -98,6 +98,7 @@ */ private boolean immutable; private boolean sourceRequired = true; + private Boolean sourceRequiredForMetadata; /* * Support properties @@ -223,6 +224,23 @@ this.sourceRequired = value; } + /** + * Flag that indicates if a underlying source connection required for this execution factory to return metadata + * @return {@link Boolean#TRUE} if required, null if possibly required, or {@link Boolean#FALSE} if not required + */ + public boolean isSourceRequiredForMetadata() { + if (sourceRequiredForMetadata == null) { + //matches pre 8.1 behavior + return sourceRequired; + } + //TODO we could also consider making this an annotation of the getMetadata call + return sourceRequiredForMetadata; + } + + public void setSourceRequiredForMetadata(boolean sourceRequiredForMetadata) { + this.sourceRequiredForMetadata = sourceRequiredForMetadata; + } + /** * Obtain a reference to the default LanguageFactory that can be used to construct * new language interface objects. This is typically needed when modifying the language @@ -836,8 +854,9 @@ * Implement to provide metadata to the metadata for use by the engine. This is the * primary method of creating metadata for dynamic VDBs. * @param metadataFactory - * @param conn may be null if there was an error obtaining a connection - * @throws TranslatorException + * @param conn may be null if the source is not required + * @throws TranslatorException to indicate a recoverable error, otherwise a RuntimeException + * @see #isSourceRequiredForMetadata() */ public void getMetadata(MetadataFactory metadataFactory, C conn) throws TranslatorException { Modified: trunk/api/src/test/java/org/teiid/translator/TestBaseDelegatingExecutionFactory.java =================================================================== --- trunk/api/src/test/java/org/teiid/translator/TestBaseDelegatingExecutionFactory.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/api/src/test/java/org/teiid/translator/TestBaseDelegatingExecutionFactory.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -34,7 +34,7 @@ Method[] methods = ExecutionFactory.class.getDeclaredMethods(); Method[] proxyMethods = BaseDelegatingExecutionFactory.class.getDeclaredMethods(); //excluding the setter methods the counts should be equal - assertEquals(methods.length - 9, proxyMethods.length); + assertEquals(methods.length - 10, proxyMethods.length); } } Modified: trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html =================================================================== --- trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-07-20 17:06:31 UTC (rev 4249) @@ -29,6 +29,7 @@ <li><B>VDB Reuse</B> a vdb.xml can now declare imported vdbs to reuse metadata. <LI><B>Comparable Object</B> - the system property org.teiid.comparableObject can be set to use OBJECT values in comparison/sorting/grouping operations. It is expected that the object values correctly implement Comparable.compareTo. <LI><B>Admin Metadata</B> - you can now retrieve metadata in DDL from the admin api via the getSchema method. + <LI><B>Improved VDB loading</B> - vdb loading logic was refined to make administration easier. ExecutionFactory now has is/setSourceRequiredForMetadata() to indicate whether a source connection is needed for the getMetadata call. </UL> <h2><a name="Compatibility">Compatibility Issues</a></h2> @@ -46,7 +47,7 @@ <li>DDL functions/procedures defined without the VIRTUAL keyword are by default VIRTUAL. Use the FOREIGN keyword to indicate that they are source specific. <li>FunctionMethod.getFullName returns the proper schema, not category qualified name. <li>VDB.getUrl has been removed. - <li>VDB.Status now has three states - LOADING, ACTIVE, REMOVED. To check for validity use the isValid method, rather than checking for the VALID state. + <li>VDB.Status now has four states - LOADING, ACTIVE, FAILED, REMOVED. To check for validity use the isValid method, rather than checking for the VALID state. FAILED deployments will still be accessible via the admin getVDB methods. <li>The standalone and cli configuration files specify a setting for the teiid subsystem policy-decider-module. If a module is not specified, then data roles will not be checked. <li>local connections specifying a VDB version will wait for their VDB to finish loading before allowing a connection, see the waitForLoad connection property for more. <li>jsonToXml document elements will contain xsi:type attribute values of decimal and boolean respectively for number and boolean json values to allow for differentiation from string values. @@ -54,6 +55,8 @@ <li>Datatype default values have been corrected for Teiid built-in types. All datatypes are now nullable by default, only character string types are case sensitive, numeric types have radix 10, and length/precision/scale have been set appropriately. <li>pg catalog and dynamic vdb created metadata will use a generated Teiid id rather than a random UUID. <li>transport ssl config no longer uses the enabled attribute. Use mode=disabled to disable the usage of encryption. + <li>If a MetadataRepository throws a RuntimeException during load, that will be treated as a non-recoverable error and the VDB will have a FAILED status. + <li>It was an undocumented behavior that is a source did not specify a jndi connection that "java:/name" would be assumed. That is no longer the case. It the source needs a connection, then one must be specified. <ul> <h4>from 7.x</h4> Modified: trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/translator/yahoo/YahooExecutionFactory.java =================================================================== --- trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/translator/yahoo/YahooExecutionFactory.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/translator/yahoo/YahooExecutionFactory.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -44,6 +44,7 @@ public YahooExecutionFactory() { setMaxInCriteriaSize(YAHOO_MAX_SET_SIZE); + setSourceRequiredForMetadata(false); } @Override Modified: trunk/connectors/translator-file/src/main/java/org/teiid/translator/file/FileExecutionFactory.java =================================================================== --- trunk/connectors/translator-file/src/main/java/org/teiid/translator/file/FileExecutionFactory.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/connectors/translator-file/src/main/java/org/teiid/translator/file/FileExecutionFactory.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -147,6 +147,10 @@ private Charset encoding = Charset.defaultCharset(); private boolean exceptionIfFileNotFound; + public FileExecutionFactory() { + setSourceRequired(false); + } + @TranslatorProperty(display="File Encoding",advanced=true) public String getEncoding() { return encoding.name(); Modified: trunk/connectors/translator-olap/src/main/java/org/teiid/translator/olap/OlapExecutionFactory.java =================================================================== --- trunk/connectors/translator-olap/src/main/java/org/teiid/translator/olap/OlapExecutionFactory.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/connectors/translator-olap/src/main/java/org/teiid/translator/olap/OlapExecutionFactory.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -48,6 +48,10 @@ public class OlapExecutionFactory extends ExecutionFactory<DataSource, Connection> { private static final String INVOKE_MDX = "invokeMdx"; //$NON-NLS-1$ + public OlapExecutionFactory() { + setSourceRequiredForMetadata(false); + } + @Override public void getMetadata(MetadataFactory metadataFactory, Connection conn) throws TranslatorException { Procedure p = metadataFactory.addProcedure(INVOKE_MDX); Modified: trunk/connectors/translator-ws/src/main/java/org/teiid/translator/ws/WSExecutionFactory.java =================================================================== --- trunk/connectors/translator-ws/src/main/java/org/teiid/translator/ws/WSExecutionFactory.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/connectors/translator-ws/src/main/java/org/teiid/translator/ws/WSExecutionFactory.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -73,6 +73,10 @@ private Mode defaultServiceMode = Mode.PAYLOAD; private Binding defaultBinding = Binding.SOAP12; private String xmlParamName; + + public WSExecutionFactory() { + setSourceRequiredForMetadata(false); + } @TranslatorProperty(description="Contols request/response message wrapping - set to MESSAGE for full control over SOAP messages.", display="Default Service Mode") public Mode getDefaultServiceMode() { Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManagerRepository.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManagerRepository.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManagerRepository.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -29,8 +29,10 @@ import java.util.concurrent.ConcurrentHashMap; import org.teiid.adminapi.impl.ModelMetaData; +import org.teiid.adminapi.impl.SourceMappingMetadata; import org.teiid.adminapi.impl.VDBMetaData; import org.teiid.core.TeiidException; +import org.teiid.core.util.EquivalenceUtil; import org.teiid.query.QueryPlugin; import org.teiid.translator.ExecutionFactory; @@ -80,13 +82,13 @@ if (sourceNames.size() > 1 && !model.isSupportsMultiSourceBindings()) { throw new ConnectorManagerException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID31102, model.getName(), deployment.getName(), deployment.getVersion())); } - for (String source:sourceNames) { - ConnectorManager cm = getConnectorManager(source); - String name = model.getSourceTranslatorName(source); - String connection = model.getSourceConnectionJndiName(source); + for (SourceMappingMetadata source : model.getSourceMappings()) { + ConnectorManager cm = getConnectorManager(source.getName()); + String name = source.getTranslatorName(); + String connection = source.getConnectionJndiName(); if (cm != null) { if (!cm.getTranslatorName().equals(name) - || !cm.getConnectionName().equals(connection)) { + || !EquivalenceUtil.areEqual(cm.getConnectionName(), connection)) { throw new ConnectorManagerException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID31103, source, deployment.getName(), deployment.getVersion())); } continue; @@ -94,7 +96,7 @@ cm = createConnectorManager(name, connection); ExecutionFactory<Object, Object> ef = provider.getExecutionFactory(name); cm.setExecutionFactory(ef); - addConnectorManager(source, cm); + addConnectorManager(source.getName(), cm); } } } Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -43,6 +43,7 @@ import org.teiid.adminapi.AdminException; import org.teiid.adminapi.Request.ProcessingState; import org.teiid.adminapi.Request.ThreadState; +import org.teiid.adminapi.VDB.Status; import org.teiid.adminapi.impl.RequestMetadata; import org.teiid.adminapi.impl.TransactionMetadata; import org.teiid.adminapi.impl.WorkerPoolStatisticsMetadata; @@ -318,7 +319,7 @@ public ResultsFuture<ResultsMessage> executeRequest(long reqID,RequestMessage requestMsg) throws TeiidProcessingException { DQPWorkContext workContext = DQPWorkContext.getWorkContext(); - checkLoading(workContext); + checkActive(workContext); RequestID requestID = workContext.getRequestID(reqID); requestMsg.setFetchSize(Math.min(requestMsg.getFetchSize(), this.config.getMaxRowsFetchSize())); Request request = null; @@ -874,14 +875,14 @@ boolean allowDoubleQuotedVariable) throws TeiidComponentException, TeiidProcessingException { DQPWorkContext workContext = DQPWorkContext.getWorkContext(); - checkLoading(workContext); + checkActive(workContext); MetaDataProcessor processor = new MetaDataProcessor(this, this.prepPlanCache, workContext.getVdbName(), workContext.getVdbVersion()); return processor.processMessage(workContext.getRequestID(requestID), workContext, preparedSql, allowDoubleQuotedVariable); } - private void checkLoading(DQPWorkContext workContext) + private void checkActive(DQPWorkContext workContext) throws TeiidProcessingException { - if (workContext.getVDB().isLoading()) { + if (workContext.getVDB().getStatus() != Status.ACTIVE) { throw new TeiidProcessingException(QueryPlugin.Event.TEIID31099, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID31099, workContext.getVDB())); } } Modified: trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -483,7 +483,6 @@ TEIID30564, TEIID30565, TEIID30580, - TEIID30581, TEIID30590, TEIID30591, TEIID30600, Modified: trunk/engine/src/main/java/org/teiid/query/metadata/BaseMetadataRepository.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/BaseMetadataRepository.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/engine/src/main/java/org/teiid/query/metadata/BaseMetadataRepository.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -28,16 +28,16 @@ import org.teiid.metadata.MetadataRepository; import org.teiid.metadata.Procedure; import org.teiid.metadata.Table; +import org.teiid.metadata.TableStats; import org.teiid.metadata.Table.TriggerEvent; -import org.teiid.metadata.TableStats; import org.teiid.translator.ExecutionFactory; import org.teiid.translator.TranslatorException; -public class BaseMetadataRepository<F, C> implements MetadataRepository { +public class BaseMetadataRepository<F, C> implements MetadataRepository<F, C> { protected MetadataRepository nextRepository; @Override - public void loadMetadata(MetadataFactory factory, ExecutionFactory executionFactory, Object connectionFactory) throws TranslatorException { + public void loadMetadata(MetadataFactory factory, ExecutionFactory<F, C> executionFactory, F connectionFactory) throws TranslatorException { if (this.nextRepository != null) { this.nextRepository.loadMetadata(factory, executionFactory, connectionFactory); } Modified: trunk/engine/src/main/java/org/teiid/query/metadata/DDLMetadataRepository.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/DDLMetadataRepository.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/engine/src/main/java/org/teiid/query/metadata/DDLMetadataRepository.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -21,6 +21,7 @@ */ package org.teiid.query.metadata; +import org.teiid.core.TeiidRuntimeException; import org.teiid.metadata.MetadataFactory; import org.teiid.query.QueryPlugin; import org.teiid.query.parser.ParseException; @@ -36,7 +37,7 @@ try { QueryParser.getQueryParser().parseDDL(factory, factory.getRawMetadata()); } catch (ParseException e) { - throw new TranslatorException(QueryPlugin.Event.TEIID30386, e); + throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30386, e); } super.loadMetadata(factory, executionFactory, connectionFactory); } Modified: trunk/engine/src/main/java/org/teiid/query/metadata/NativeMetadataRepository.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/NativeMetadataRepository.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/engine/src/main/java/org/teiid/query/metadata/NativeMetadataRepository.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -24,11 +24,7 @@ import javax.resource.ResourceException; import org.teiid.metadata.MetadataFactory; -import org.teiid.metadata.Schema; -import org.teiid.metadata.Table; import org.teiid.query.QueryPlugin; -import org.teiid.query.function.metadata.FunctionMetadataValidator; -import org.teiid.query.validator.ValidatorReport; import org.teiid.resource.spi.WrappedConnection; import org.teiid.translator.ExecutionFactory; import org.teiid.translator.TranslatorException; @@ -42,7 +38,7 @@ throw new TranslatorException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30591, factory.getName())); } - if (connectionFactory == null && executionFactory.isSourceRequired()) { + if (connectionFactory == null && executionFactory.isSourceRequiredForMetadata()) { throw new TranslatorException(QueryPlugin.Event.TEIID31097, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID31097)); } @@ -53,7 +49,10 @@ try { unwrapped = ((WrappedConnection)connection).unwrap(); } catch (ResourceException e) { - throw new TranslatorException(QueryPlugin.Event.TEIID30477, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30477)); + if (executionFactory.isSourceRequiredForMetadata()) { + throw new TranslatorException(QueryPlugin.Event.TEIID30477, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30477)); + } + connection = null; } } @@ -62,21 +61,7 @@ } finally { executionFactory.closeConnection(connection, connectionFactory); } - validateMetadata(factory.getSchema()); - super.loadMetadata(factory, executionFactory, connectionFactory); } - private void validateMetadata(Schema schema) throws TranslatorException { - for (Table t : schema.getTables().values()) { - if (t.getColumns() == null || t.getColumns().size() == 0) { - throw new TranslatorException(QueryPlugin.Event.TEIID30580, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30580, t.getFullName())); - } - } - ValidatorReport report = new ValidatorReport("Translator metadata load " + schema.getName()); //$NON-NLS-1$ - FunctionMetadataValidator.validateFunctionMethods(schema.getFunctions().values(),report); - if(report.hasItems()) { - throw new TranslatorException(QueryPlugin.Util.getString("ERR.015.001.0005", report)); //$NON-NLS-1$ - } - } } Modified: trunk/engine/src/main/resources/org/teiid/query/i18n.properties =================================================================== --- trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2012-07-20 17:06:31 UTC (rev 4249) @@ -974,7 +974,6 @@ TEIID30519=Unknown START flags TEIID30517=Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first. -TEIID30580=Invalid schema from translator metadata expected {0}, but the returned MetadataStore contained no such schema or more than 1 schema. TEIID30581=Invalid table {0}. A table must have 1 or more columns. TEIID30590=Transaction Is null @@ -1016,7 +1015,7 @@ TEIID31096=Canceling query {0} since it has exceeded the timeout of {1} milliseconds. -TEIID31099=VDB {0} is still loading. Resubmit your query after loading has completed. +TEIID31099=VDB {0} is not active. Resubmit your query after loading has completed or after the errors have been corrected. TEIID31101=Source names are not unique for model {0} in {1}.{2} TEIID31102=Multiple sources on non multi-source model {0} in {1}.{2} Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -21,15 +21,7 @@ */ package org.teiid.jboss; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ALLOWED; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DEFAULT; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DESCRIPTION; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.READ_ONLY; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REPLY_PROPERTIES; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REQUEST_PROPERTIES; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REQUIRED; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.TYPE; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.VALUE_TYPE; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; import java.math.BigDecimal; import java.math.BigInteger; @@ -37,7 +29,12 @@ import java.sql.Clob; import java.sql.SQLException; import java.sql.SQLXML; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.EnumSet; +import java.util.List; +import java.util.ResourceBundle; import java.util.concurrent.Callable; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; @@ -56,7 +53,10 @@ import org.jboss.jca.common.api.metadata.ra.ResourceAdapter1516; import org.jboss.msc.service.ServiceController; import org.jboss.msc.service.ServiceName; -import org.teiid.adminapi.*; +import org.teiid.adminapi.Admin; +import org.teiid.adminapi.AdminException; +import org.teiid.adminapi.AdminProcessingException; +import org.teiid.adminapi.VDB; import org.teiid.adminapi.Admin.SchemaObjectType; import org.teiid.adminapi.VDB.ConnectionType; import org.teiid.adminapi.impl.CacheStatisticsMetadata; @@ -65,10 +65,10 @@ import org.teiid.adminapi.impl.TransactionMetadata; import org.teiid.adminapi.impl.VDBMetaData; import org.teiid.adminapi.impl.VDBMetadataMapper; -import org.teiid.adminapi.impl.VDBMetadataMapper.TransactionMetadataMapper; -import org.teiid.adminapi.impl.VDBMetadataMapper.VDBTranslatorMetaDataMapper; import org.teiid.adminapi.impl.VDBTranslatorMetaData; import org.teiid.adminapi.impl.WorkerPoolStatisticsMetadata; +import org.teiid.adminapi.impl.VDBMetadataMapper.TransactionMetadataMapper; +import org.teiid.adminapi.impl.VDBMetadataMapper.VDBTranslatorMetaDataMapper; import org.teiid.client.RequestMessage; import org.teiid.client.ResultsMessage; import org.teiid.client.plan.PlanNode; @@ -697,7 +697,7 @@ String user = "CLI ADMIN"; //$NON-NLS-1$ LogManager.logDetail(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("admin_executing", user, command)); //$NON-NLS-1$ - VDBMetaData vdb = this.vdbRepo.getVDB(vdbName, version); + VDBMetaData vdb = this.vdbRepo.getLiveVDB(vdbName, version); if (vdb == null) { throw new OperationFailedException(new ModelNode().set(IntegrationPlugin.Util.getString("wrong_vdb")));//$NON-NLS-1$ } @@ -894,7 +894,7 @@ int vdbVersion = operation.get(OperationsConstants.VDB_VERSION).asInt(); String modelName = operation.get(OperationsConstants.MODEL_NAME).asString(); - VDBMetaData vdb = repo.getVDB(vdbName, vdbVersion); + VDBMetaData vdb = repo.getLiveVDB(vdbName, vdbVersion); if (vdb == null || (vdb.getStatus() != VDB.Status.ACTIVE)) { throw new OperationFailedException(new ModelNode().set(IntegrationPlugin.Util.getString("no_vdb_found", vdbName, vdbVersion))); //$NON-NLS-1$ } @@ -972,9 +972,6 @@ ModelNode result = context.getResult(); List<VDBMetaData> vdbs = repo.getVDBs(); for (VDBMetaData vdb:vdbs) { - if (vdb == null) { - continue; // when vdb deployed but metadata is still being loaded this reports as null - } VDBMetadataMapper.INSTANCE.wrap(vdb, result.add()); } } Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -143,6 +143,8 @@ indexRepo = new IndexMetadataRepository(indexFactory); visibilityMap = indexFactory.getEntriesPlusVisibilities(); } + VDBRepository repo = vdbStatusChecker.getVDBRepository(); + repo.addPendingDeployment(deployment); // build a VDB service final VDBService vdb = new VDBService(deployment, visibilityMap); if (indexRepo != null) { @@ -325,6 +327,8 @@ LogManager.logTrace(LogConstants.CTX_RUNTIME, "VDB "+vdb.getName()+" metadata removed"); //$NON-NLS-1$ //$NON-NLS-2$ } } + final VDBMetaData deployment = deploymentUnit.getAttachment(TeiidAttachments.VDB_METADATA); + this.vdbStatusChecker.getVDBRepository().removeVDB(deployment.getName(), deployment.getVersion()); } } Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -366,20 +366,17 @@ ConnectorManager cm = getConnectorManager(model, cmr); if (cm != null) { ef = cm.getExecutionFactory(); - if (ef.isSourceRequired()) { - cf = cm.getConnectionFactory(); - } + cf = cm.getConnectionFactory(); } - } catch (TranslatorException e1) { - //ignore data source not availability, it may not be required. + } catch (TranslatorException e) { + //cf not available } - try { metadataRepo.loadMetadata(factory, ef, cf); + LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50030,vdb.getName(), vdb.getVersion(), model.getName(), SimpleDateFormat.getInstance().format(new Date()))); metadataLoaded = true; - LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50030,vdb.getName(), vdb.getVersion(), model.getName(), SimpleDateFormat.getInstance().format(new Date()))); - } catch (Exception e) { - ex = e; + } catch (Exception e) { + ex = e; } } @@ -390,12 +387,16 @@ cacheMetadataStore(model, factory); } - metadataLoaded(vdb, model, vdbMetadataStore, loadCount, factory); + metadataLoaded(vdb, model, vdbMetadataStore, loadCount, factory, true); } else { model.addRuntimeError(ex.getMessage()); LogManager.logWarning(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50036,vdb.getName(), vdb.getVersion(), model.getName(), ex.getMessage())); - //defer the load to the status checker if/when a source is available/redeployed - model.addAttchment(Runnable.class, this); + if (ex instanceof RuntimeException) { + metadataLoaded(vdb, model, vdbMetadataStore, loadCount, factory, false); + } else { + //defer the load to the status checker if/when a source is available/redeployed + model.addAttchment(Runnable.class, this); + } } } } Modified: trunk/runtime/src/main/java/org/teiid/deployers/EventDistributorImpl.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/EventDistributorImpl.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/runtime/src/main/java/org/teiid/deployers/EventDistributorImpl.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -50,7 +50,7 @@ @Override public void updateMatViewRow(String vdbName, int vdbVersion, String schema, String viewName, List<?> tuple, boolean delete) { - VDBMetaData metadata = getVdbRepository().getVDB(vdbName, vdbVersion); + VDBMetaData metadata = getVdbRepository().getLiveVDB(vdbName, vdbVersion); if (metadata != null) { GlobalTableStore gts = metadata.getAttachment(GlobalTableStore.class); if (gts != null) { @@ -124,7 +124,7 @@ } private Schema getSchema(String vdbName, int vdbVersion, String schemaName) { - VDBMetaData vdb = getVdbRepository().getVDB(vdbName, vdbVersion); + VDBMetaData vdb = getVdbRepository().getLiveVDB(vdbName, vdbVersion); if (vdb == null) { return null; } @@ -143,7 +143,7 @@ if (t == null) { return; } - DdlPlan.alterInsteadOfTrigger(getVdbRepository().getVDB(vdbName, vdbVersion), t, triggerDefinition, enabled, triggerEvent); + DdlPlan.alterInsteadOfTrigger(getVdbRepository().getLiveVDB(vdbName, vdbVersion), t, triggerDefinition, enabled, triggerEvent); } @Override @@ -156,7 +156,7 @@ if (p == null) { return; } - DdlPlan.alterProcedureDefinition(getVdbRepository().getVDB(vdbName, vdbVersion), p, definition); + DdlPlan.alterProcedureDefinition(getVdbRepository().getLiveVDB(vdbName, vdbVersion), p, definition); } @Override @@ -165,13 +165,13 @@ if (t == null) { return; } - DdlPlan.alterView(getVdbRepository().getVDB(vdbName, vdbVersion), t, definition); + DdlPlan.alterView(getVdbRepository().getLiveVDB(vdbName, vdbVersion), t, definition); } @Override public void setProperty(String vdbName, int vdbVersion, String uuid, String name, String value) { - VDBMetaData vdb = getVdbRepository().getVDB(vdbName, vdbVersion); + VDBMetaData vdb = getVdbRepository().getLiveVDB(vdbName, vdbVersion); if (vdb == null) { return; } Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -23,6 +23,7 @@ import java.io.Serializable; import java.util.ArrayList; +import java.util.Collection; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -64,6 +65,8 @@ private static final int DEFAULT_TIMEOUT_MILLIS = PropertiesUtils.getIntProperty(System.getProperties(), "org.teiid.clientVdbLoadTimeoutMillis", 300000); //$NON-NLS-1$ private NavigableMap<VDBKey, CompositeVDB> vdbRepo = new ConcurrentSkipListMap<VDBKey, CompositeVDB>(); + private NavigableMap<VDBKey, VDBMetaData> pendingDeployments = new ConcurrentSkipListMap<VDBKey, VDBMetaData>(); + private MetadataStore systemStore = SystemMetadata.getInstance().getSystemStore(); private MetadataStore odbcStore; private boolean odbcEnabled = false; @@ -99,6 +102,7 @@ throw new VirtualDatabaseException(RuntimePlugin.Event.TEIID40035, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40035, vdb.getName(), vdb.getVersion())); } this.vdbRepo.put(key, cvdb); + this.pendingDeployments.remove(key); vdbAdded.signalAll(); } finally { lock.unlock(); @@ -151,7 +155,13 @@ return this.vdbRepo.get(new VDBKey(name, version)); } - public VDBMetaData getVDB(String name, int version) { + /** + * A live vdb may be loading or active + * @param name + * @param version + * @return + */ + public VDBMetaData getLiveVDB(String name, int version) { CompositeVDB v = getCompositeVDB(name, version); if (v != null) { return v.getVDB(); @@ -164,14 +174,26 @@ for(CompositeVDB cVDB:this.vdbRepo.values()) { vdbs.add(cVDB.getVDB()); } + //there is a minor chance of a duplicate entry + //but we're not locking to prevent that + vdbs.addAll(pendingDeployments.values()); return vdbs; } + Collection<CompositeVDB> getCompositeVDBs() { + return vdbRepo.values(); + } + protected VDBKey vdbId(VDBMetaData vdb) { return new VDBKey(vdb.getName(), vdb.getVersion()); } - public VDBMetaData getVDB(String vdbName) { + /** + * A live vdb may be loading or active + * @param vdbName + * @return + */ + public VDBMetaData getLiveVDB(String vdbName) { int latestVersion = 0; VDBMetaData result = null; for (Map.Entry<VDBKey, CompositeVDB> entry:this.vdbRepo.tailMap(new VDBKey(vdbName, 0)).entrySet()) { @@ -229,6 +251,7 @@ } private VDBMetaData removeVDB(VDBKey key) { + this.pendingDeployments.remove(key); CompositeVDB removed = this.vdbRepo.remove(key); if (removed == null) { return null; @@ -255,8 +278,11 @@ if (v == null) { return; } + VDBMetaData metadataAwareVDB = v.getVDB(); + if (metadataAwareVDB.getStatus() == Status.FAILED) { + return; + } v.metadataLoadFinished(); - VDBMetaData metadataAwareVDB = v.getVDB(); synchronized (metadataAwareVDB) { ValidatorReport report = new MetadataValidator().validate(metadataAwareVDB, metadataAwareVDB.removeAttachment(MetadataStore.class)); @@ -264,9 +290,9 @@ LogManager.logInfo(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40073, name, version)); if (!v.getVDB().isPreview()) { processMetadataValidatorReport(key, report); - if (v.getVDB().getStatus() == Status.REMOVED) { - return; - } + v.getVDB().setStatus(Status.FAILED); + LogManager.logInfo(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40003,name, version, metadataAwareVDB.getStatus())); + return; } } validateDataSources(metadataAwareVDB); @@ -281,7 +307,6 @@ * @param report */ protected void processMetadataValidatorReport(VDBKey key, ValidatorReport report) { - this.removeVDB(key); } void validateDataSources(VDBMetaData vdb) { @@ -333,5 +358,19 @@ public void setSystemFunctionManager(SystemFunctionManager mgr) { this.systemFunctionManager = mgr; + } + + public void addPendingDeployment(VDBMetaData deployment) { + VDBKey key = vdbId(deployment); + this.pendingDeployments.put(key, deployment); + } + + public VDBMetaData getVDB(String vdbName, int vdbVersion) { + VDBKey key = new VDBKey(vdbName, vdbVersion); + CompositeVDB cvdb = this.vdbRepo.get(key); + if (cvdb != null) { + return cvdb.getVDB(); + } + return this.pendingDeployments.get(key); } } Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -79,7 +79,10 @@ dsName = dsName.substring(5); } - VDBMetaData vdb = getVDBRepository().getVDB(vdbName, vdbVersion); + VDBMetaData vdb = getVDBRepository().getLiveVDB(vdbName, vdbVersion); + if (vdb.getStatus() == Status.FAILED) { + return; + } ModelMetaData model = vdb.getModel(modelName); synchronized (vdb) { @@ -126,7 +129,11 @@ public void resourceAdded(String resourceName) { List<Runnable> runnables = new ArrayList<Runnable>(); - for (VDBMetaData vdb:getVDBRepository().getVDBs()) { + for (CompositeVDB cvdb:getVDBRepository().getCompositeVDBs()) { + VDBMetaData vdb = cvdb.getVDB(); + if (vdb.getStatus() == Status.FAILED) { + continue; + } synchronized (vdb) { ConnectorManagerRepository cmr = vdb.getAttachment(ConnectorManagerRepository.class); boolean usesResourse = false; @@ -183,7 +190,11 @@ } public void resourceRemoved(String resourceName) { - for (VDBMetaData vdb:getVDBRepository().getVDBs()) { + for (CompositeVDB cvdb:getVDBRepository().getCompositeVDBs()) { + VDBMetaData vdb = cvdb.getVDB(); + if (vdb.getStatus() == Status.FAILED) { + continue; + } synchronized (vdb) { ConnectorManagerRepository cmr = vdb.getAttachment(ConnectorManagerRepository.class); for (ModelMetaData model:vdb.getModelMetaDatas().values()) { @@ -191,13 +202,14 @@ if (sourceName == null) { continue; } + Severity severity = Severity.WARNING; ConnectorManager cm = cmr.getConnectorManager(sourceName); - if (cm.getExecutionFactory().isSourceRequired()) { - String msg = RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40012, vdb.getName(), vdb.getVersion(), resourceName); - Severity severity = vdb.getStatus() == Status.LOADING?Severity.WARNING:Severity.ERROR; - model.addRuntimeMessage(severity, msg); - LogManager.logInfo(LogConstants.CTX_RUNTIME, msg); + if (cm.getExecutionFactory().isSourceRequired() && vdb.getStatus() == Status.ACTIVE) { + severity = Severity.ERROR; } + String msg = RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40012, vdb.getName(), vdb.getVersion(), resourceName); + model.addRuntimeMessage(severity, msg); + LogManager.logInfo(LogConstants.CTX_RUNTIME, msg); } } } Modified: trunk/runtime/src/main/java/org/teiid/runtime/AbstractVDBDeployer.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/runtime/AbstractVDBDeployer.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/runtime/src/main/java/org/teiid/runtime/AbstractVDBDeployer.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -30,6 +30,7 @@ import org.teiid.adminapi.Model; import org.teiid.adminapi.Model.Type; +import org.teiid.adminapi.VDB.Status; import org.teiid.adminapi.impl.ModelMetaData; import org.teiid.adminapi.impl.SourceMappingMetadata; import org.teiid.adminapi.impl.VDBMetaData; @@ -152,12 +153,16 @@ protected void metadataLoaded(final VDBMetaData vdb, final ModelMetaData model, final MetadataStore vdbMetadataStore, - final AtomicInteger loadCount, MetadataFactory factory) { - // merge into VDB metadata - factory.mergeInto(vdbMetadataStore); + final AtomicInteger loadCount, MetadataFactory factory, boolean success) { + if (success) { + // merge into VDB metadata + factory.mergeInto(vdbMetadataStore); - //TODO: this is not quite correct, the source may be missing - model.clearRuntimeMessages(); + //TODO: this is not quite correct, the source may be missing + model.clearRuntimeMessages(); + } else { + vdb.setStatus(Status.FAILED); + } if (loadCount.decrementAndGet() == 0) { getVDBRepository().finishDeployment(vdb.getName(), vdb.getVersion()); Modified: trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -509,16 +509,14 @@ ConnectorManager cm = getConnectorManager(model, cmr); if (cm != null) { ef = cm.getExecutionFactory(); - if (ef.isSourceRequired()) { - cf = cm.getConnectionFactory(); - } + cf = cm.getConnectionFactory(); } - } catch (TranslatorException e1) { - //ignore data source not availability, it may not be required. + } catch (TranslatorException e) { + //cf not available } metadataRepository.loadMetadata(factory, ef, cf); - metadataLoaded(vdb, model, store, loadCount, factory); + metadataLoaded(vdb, model, store, loadCount, factory, true); } public void undeployVDB(String vdbName) { Modified: trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -247,10 +247,10 @@ try { if (vdbVersion == null) { vdbVersion = "latest"; //$NON-NLS-1$ - vdb = this.vdbRepository.getVDB(vdbName); + vdb = this.vdbRepository.getLiveVDB(vdbName); } else { - vdb = this.vdbRepository.getVDB(vdbName, Integer.parseInt(vdbVersion)); + vdb = this.vdbRepository.getLiveVDB(vdbName, Integer.parseInt(vdbVersion)); } } catch (NumberFormatException e) { throw new SessionServiceException(RuntimePlugin.Event.TEIID40045, e, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40045, vdbVersion)); Modified: trunk/runtime/src/test/java/org/teiid/services/TestSessionServiceImpl.java =================================================================== --- trunk/runtime/src/test/java/org/teiid/services/TestSessionServiceImpl.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/runtime/src/test/java/org/teiid/services/TestSessionServiceImpl.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -41,13 +41,13 @@ vdb.setStatus(Status.ACTIVE); - Mockito.stub(repo.getVDB("name")).toReturn(vdb); + Mockito.stub(repo.getLiveVDB("name")).toReturn(vdb); ssi.setVDBRepository(repo); ssi.getActiveVDB("name", null); - Mockito.verify(repo, Mockito.times(1)).getVDB("name"); + Mockito.verify(repo, Mockito.times(1)).getLiveVDB("name"); } @Test @@ -59,13 +59,13 @@ vdb.setStatus(Status.ACTIVE); - Mockito.stub(repo.getVDB("name", 1)).toReturn(vdb); + Mockito.stub(repo.getLiveVDB("name", 1)).toReturn(vdb); ssi.setVDBRepository(repo); ssi.getActiveVDB("name", "1"); - Mockito.verify(repo, Mockito.times(1)).getVDB("name", 1); + Mockito.verify(repo, Mockito.times(1)).getLiveVDB("name", 1); } @@ -78,13 +78,13 @@ vdb.setStatus(Status.ACTIVE); - Mockito.stub(repo.getVDB("name", 1)).toReturn(vdb); + Mockito.stub(repo.getLiveVDB("name", 1)).toReturn(vdb); ssi.setVDBRepository(repo); ssi.getActiveVDB("name.1", null); - Mockito.verify(repo, Mockito.times(1)).getVDB("name", 1); + Mockito.verify(repo, Mockito.times(1)).getLiveVDB("name", 1); } @Test @@ -96,7 +96,7 @@ vdb.setStatus(Status.ACTIVE); - Mockito.stub(repo.getVDB("name", 1)).toReturn(vdb); + Mockito.stub(repo.getLiveVDB("name", 1)).toReturn(vdb); ssi.setVDBRepository(repo); @@ -116,7 +116,7 @@ vdb.setStatus(Status.ACTIVE); - Mockito.stub(repo.getVDB("name", 1)).toReturn(vdb); + Mockito.stub(repo.getLiveVDB("name", 1)).toReturn(vdb); ssi.setVDBRepository(repo); Modified: trunk/test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestDeployment.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestDeployment.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestDeployment.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -498,10 +498,22 @@ String ddl = admin.getSchema(vdbName, 1, "loopy", null, null); String expected = "CREATE FOREIGN TABLE Matadata (\n" + - " execCount int OPTIONS (SEARCHABLE 'Searchable')\n" + + " execCount integer\n" + ");"; assertEquals(expected, ddl); admin.undeploy("loopy.jar"); } + + @Test public void testErrorDeployment() throws Exception { + Collection<?> vdbs = admin.getVDBs(); + assertTrue(vdbs.isEmpty()); + + admin.deploy("error-vdb.xml",new FileInputStream(UnitTestUtil.getTestDataFile("error-vdb.xml"))); + + AdminUtil.waitForVDBLoad(admin, "error", 1, 3); + VDB vdb = admin.getVDB("error", 1); + assertEquals(Status.FAILED, vdb.getStatus()); + } + } Modified: trunk/test-integration/common/src/test/java/org/teiid/arquillian/SampleExecutionFactory.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/arquillian/SampleExecutionFactory.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/test-integration/common/src/test/java/org/teiid/arquillian/SampleExecutionFactory.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -29,7 +29,11 @@ import org.teiid.metadata.MetadataFactory; import org.teiid.metadata.RuntimeMetadata; import org.teiid.metadata.Table; -import org.teiid.translator.*; +import org.teiid.translator.DataNotAvailableException; +import org.teiid.translator.Execution; +import org.teiid.translator.ExecutionContext; +import org.teiid.translator.ResultSetExecution; +import org.teiid.translator.TranslatorException; import org.teiid.translator.loopback.LoopbackExecution; import org.teiid.translator.loopback.LoopbackExecutionFactory; @@ -42,6 +46,8 @@ setSupportsSelectDistinct(true); setWaitTime(10); setRowCount(200); + setSourceRequiredForMetadata(false); + setSourceRequired(false); } @Override Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -178,7 +178,7 @@ this.repo.addVDB(vdbMetaData, metadata, (metadata instanceof IndexMetadataStore)?((IndexMetadataStore)metadata).getEntriesPlusVisibilities():null, udfMetaData, cmr); this.repo.finishDeployment(vdbMetaData.getName(), vdbMetaData.getVersion()); - this.repo.getVDB(vdbMetaData.getName(), vdbMetaData.getVersion()).setStatus(VDB.Status.ACTIVE); + this.repo.getLiveVDB(vdbMetaData.getName(), vdbMetaData.getVersion()).setStatus(VDB.Status.ACTIVE); } catch (VirtualDatabaseException e) { throw new RuntimeException(e); } @@ -198,7 +198,7 @@ } public VDBMetaData getVDB(String vdbName) { - return this.repo.getVDB(vdbName, 1); + return this.repo.getLiveVDB(vdbName, 1); } public void undeployVDB(String vdbName) { Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java 2012-07-20 00:58:49 UTC (rev 4248) +++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java 2012-07-20 17:06:31 UTC (rev 4249) @@ -109,7 +109,7 @@ importProperties.setProperty("importer.excludeTables", "VDB\\.SYS\\..*"); importProperties.setProperty("importer.excludeProcedures", "VDB\\..*"); MetadataFactory mf = getMetadata(importProperties, conn); - assertEquals(17, mf.asMetadataStore().getSchemas().get("TEST").getTables().size()); + assertEquals(String.valueOf(mf.asMetadataStore().getSchemas().get("TEST").getTables()), 17, mf.asMetadataStore().getSchemas().get("TEST").getTables().size()); assertEquals(0, mf.asMetadataStore().getSchemas().get("TEST").getProcedures().size()); } Added: trunk/test-integration/common/src/test/resources/error-vdb.xml =================================================================== --- trunk/test-integration/common/src/test/resources/error-vdb.xml (rev 0) +++ trunk/test-integration/common/src/test/resources/error-vdb.xml 2012-07-20 17:06:31 UTC (rev 4249) @@ -0,0 +1,8 @@ +<vdb name="error" version= "1"> + <model visible = "true" type = "VIRTUAL" name = "x"> + <metadata type = "DDL"><![CDATA[ + i'm not valid + ]]> + </metadata> + </model> +</vdb> \ No newline at end of file Property changes on: trunk/test-integration/common/src/test/resources/error-vdb.xml ___________________________________________________________________ Added: svn:mime-type + text/plain

10 years, 4 months

1
0
0 / 0

teiid SVN: r4248 - in trunk: jboss-integration/src/main/java/org/teiid/jboss and 4 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2012-07-19 20:58:49 -0400 (Thu, 19 Jul 2012) New Revision: 4248 Modified: trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html trunk/jboss-integration/src/main/java/org/teiid/jboss/Element.java trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidSubsystemParser.java trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties trunk/jboss-integration/src/test/resources/teiid-sample-config.xml trunk/jboss-integration/src/test/resources/teiid-transport-config.txt trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java trunk/runtime/src/test/java/org/teiid/transport/TestCommSockets.java Log: TEIID-2108 fix for ssl mode setting Modified: trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html =================================================================== --- trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-07-19 20:28:45 UTC (rev 4247) +++ trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-07-20 00:58:49 UTC (rev 4248) @@ -53,6 +53,7 @@ <li>Result set cache entries can now have updatable set to false to indicate that updates should not purge the entry. <li>Datatype default values have been corrected for Teiid built-in types. All datatypes are now nullable by default, only character string types are case sensitive, numeric types have radix 10, and length/precision/scale have been set appropriately. <li>pg catalog and dynamic vdb created metadata will use a generated Teiid id rather than a random UUID. + <li>transport ssl config no longer uses the enabled attribute. Use mode=disabled to disable the usage of encryption. <ul> <h4>from 7.x</h4> Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/Element.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/Element.java 2012-07-19 20:28:45 UTC (rev 4247) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/Element.java 2012-07-20 00:58:49 UTC (rev 4248) @@ -22,10 +22,7 @@ package org.teiid.jboss; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DEFAULT; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DESCRIPTION; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REQUIRED; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.TYPE; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; import java.util.HashMap; import java.util.Map; @@ -111,7 +108,6 @@ PG_MAX_LOB_SIZE_ALLOWED_ELEMENT("max-lob-size-in-bytes", "pg-max-lob-size-in-bytes", ModelType.INT, false, "5242880"), //$NON-NLS-1$ //$NON-NLS-2$ SSL_ELEMENT("ssl"), - SSL_ENABLE_ATTRIBUTE("enable", "ssl-enable", ModelType.BOOLEAN, false, "false"), SSL_MODE_ATTRIBUTE("mode", "ssl-mode", ModelType.STRING, false, "login"), SSL_AUTH_MODE_ATTRIBUTE("authentication-mode", "ssl-authentication-mode", ModelType.STRING, false, "anonymous"), SSL_SSL_PROTOCOL_ATTRIBUTE("ssl-protocol", "ssl-ssl-protocol", ModelType.STRING, false, "SSLv3"), Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidSubsystemParser.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidSubsystemParser.java 2012-07-19 20:28:45 UTC (rev 4247) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidSubsystemParser.java 2012-07-20 00:58:49 UTC (rev 4248) @@ -21,11 +21,8 @@ */ package org.teiid.jboss; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; -import static org.jboss.as.controller.parsing.ParseUtils.requireNoAttributes; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; +import static org.jboss.as.controller.parsing.ParseUtils.*; import java.util.ArrayList; import java.util.Collections; @@ -160,7 +157,6 @@ if (like(node, Element.SSL_ELEMENT)) { writer.writeStartElement(Element.SSL_ELEMENT.getLocalName()); - writeAttribute(writer, Element.SSL_ENABLE_ATTRIBUTE, node); writeAttribute(writer, Element.SSL_MODE_ATTRIBUTE, node); writeAttribute(writer, Element.SSL_AUTH_MODE_ATTRIBUTE, node); writeAttribute(writer, Element.SSL_SSL_PROTOCOL_ATTRIBUTE, node); @@ -496,7 +492,6 @@ Element element = Element.forName(attrName, Element.SSL_ELEMENT); switch(element) { - case SSL_ENABLE_ATTRIBUTE: case SSL_MODE_ATTRIBUTE: case SSL_AUTH_MODE_ATTRIBUTE: case SSL_SSL_PROTOCOL_ATTRIBUTE: Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java 2012-07-19 20:28:45 UTC (rev 4247) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java 2012-07-20 00:58:49 UTC (rev 4248) @@ -21,11 +21,7 @@ */ package org.teiid.jboss; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DESCRIPTION; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OPERATION_NAME; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REQUEST_PROPERTIES; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; import java.util.Arrays; import java.util.Collections; @@ -83,7 +79,6 @@ Element.PG_MAX_LOB_SIZE_ALLOWED_ELEMENT, - Element.SSL_ENABLE_ATTRIBUTE, Element.SSL_MODE_ATTRIBUTE, Element.SSL_AUTH_MODE_ATTRIBUTE, Element.SSL_SSL_PROTOCOL_ATTRIBUTE, @@ -246,15 +241,9 @@ socket.setOutputBufferSize(Element.TRANSPORT_OUT_BUFFER_SIZE_ATTRIBUTE.asInt(node)); } - boolean sslEnabled = false; SSLConfiguration ssl = new SSLConfiguration(); - ssl.setAuthenticationMode(SSLConfiguration.ANONYMOUS); + ssl.setMode(SSLConfiguration.DISABLED); - if (Element.SSL_ENABLE_ATTRIBUTE.isDefined(node)) { - ssl.setMode(Element.SSL_ENABLE_ATTRIBUTE.asString(node)); - sslEnabled = true; - } - if (Element.SSL_MODE_ATTRIBUTE.isDefined(node)) { ssl.setMode(Element.SSL_MODE_ATTRIBUTE.asString(node)); } @@ -293,9 +282,7 @@ if (Element.SSL_TRUSTSTORE_PASSWORD_ATTRIBUTE.isDefined(node)) { ssl.setTruststorePassword(Element.SSL_TRUSTSTORE_PASSWORD_ATTRIBUTE.asString(node)); } - if (sslEnabled) { - socket.setSSLConfiguration(ssl); - } + socket.setSSLConfiguration(ssl); return socket; } Modified: trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties =================================================================== --- trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2012-07-19 20:28:45 UTC (rev 4247) +++ trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2012-07-20 00:58:49 UTC (rev 4248) @@ -142,13 +142,12 @@ pg-max-lob-size-in-bytes.describe=Max LOB size in Postgres protocol, as streaming is not supported -ssl-enable.describe=Enable SSL. ssl-mode.describe=can be one of disabled, login, or enabled \ disabled = no transport or message level security will be used; \ login = only the login traffic will be encrypted at a message level \ using 128 bit AES with an ephemerial DH key exchange. \ - No other config values are needed in this mode; \ - enabled = traffic will be secured using this configuration,if the client supports SSL + No other config values are needed in this mode; and it only applies to the JDBC transport \ + enabled = traffic will be secured using this configuration, if the client supports SSL ssl-authentication-mode.describe=Authentication Mode (1-way, 2-way, anonymous) ssl-ssl-protocol.describe=SSL protocol used ssl-keymanagement-algorithm.describe=Use key management algorithm Modified: trunk/jboss-integration/src/test/resources/teiid-sample-config.xml =================================================================== --- trunk/jboss-integration/src/test/resources/teiid-sample-config.xml 2012-07-19 20:28:45 UTC (rev 4247) +++ trunk/jboss-integration/src/test/resources/teiid-sample-config.xml 2012-07-20 00:58:49 UTC (rev 4248) @@ -35,7 +35,7 @@ <transport name="odbc" protocol="pg" socket-binding="teiid-odbc" max-socket-threads="1" input-buffer-size="2" output-buffer-size="3"> <authentication security-domain="teiid-security,teiid-security2" max-sessions-allowed="5000" sessions-expiration-timelimit="0" krb5-domain="krb5"/> <pg max-lob-size-in-bytes="5242880"/> - <ssl enable="true" mode="login" authentication-mode="1-way" ssl-protocol="ssl-protocol" keymanagement-algorithm="algo"> + <ssl mode="login" authentication-mode="1-way" ssl-protocol="ssl-protocol" keymanagement-algorithm="algo"> <keystore name="keystore name" password="keystore passs" type="keystore type"/> <truststore name="truststore name" password="truststore pass"/> </ssl> Modified: trunk/jboss-integration/src/test/resources/teiid-transport-config.txt =================================================================== --- trunk/jboss-integration/src/test/resources/teiid-transport-config.txt 2012-07-19 20:28:45 UTC (rev 4247) +++ trunk/jboss-integration/src/test/resources/teiid-transport-config.txt 2012-07-20 00:58:49 UTC (rev 4248) @@ -56,15 +56,9 @@ "required" => false, "default" => 5242880 }, - "ssl-enable" => { - "type" => BOOLEAN, - "description" => "Enable SSL.", - "required" => false, - "default" => false - }, "ssl-mode" => { "type" => STRING, - "description" => "can be one of disabled, login, or enabled disabled = no transport or message level security will be used; login = only the login traffic will be encrypted at a message level using 128 bit AES with an ephemerial DH key exchange. No other config values are needed in this mode; enabled = traffic will be secured using this configuration,if the client supports SSL", + "description" => "can be one of disabled, login, or enabled disabled = no transport or message level security will be used; login = only the login traffic will be encrypted at a message level using 128 bit AES with an ephemerial DH key exchange. No other config values are needed in this mode; and it only applies to the JDBC transport enabled = traffic will be secured using this configuration, if the client supports SSL", "required" => false, "default" => "login" }, Modified: trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java 2012-07-19 20:28:45 UTC (rev 4247) +++ trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java 2012-07-20 00:58:49 UTC (rev 4248) @@ -41,7 +41,7 @@ public static final String TWOWAY = "2-way"; //$NON-NLS-1$ public static final String ANONYMOUS = "anonymous"; //$NON-NLS-1$ - public static final String LOGIN = "logIn"; //$NON-NLS-1$ + public static final String LOGIN = "login"; //$NON-NLS-1$ public static final String DISABLED = "disabled"; //$NON-NLS-1$ public static final String ENABLED = "enabled"; //$NON-NLS-1$ @@ -100,11 +100,11 @@ } public boolean isClientEncryptionEnabled() { - return LOGIN.equals(mode); + return LOGIN.equalsIgnoreCase(mode); } public boolean isSslEnabled() { - return ENABLED.equals(mode); + return ENABLED.equalsIgnoreCase(mode); } public String getMode() { Modified: trunk/runtime/src/test/java/org/teiid/transport/TestCommSockets.java =================================================================== --- trunk/runtime/src/test/java/org/teiid/transport/TestCommSockets.java 2012-07-19 20:28:45 UTC (rev 4247) +++ trunk/runtime/src/test/java/org/teiid/transport/TestCommSockets.java 2012-07-20 00:58:49 UTC (rev 4248) @@ -267,4 +267,13 @@ assertArrayEquals(new String[] {"x","y","z"}, config.getEnabledCipherSuitesAsArray()); } + @Test public void testAnonSSLMode() throws Exception { + SSLConfiguration config = new SSLConfiguration(); + config.setMode("enabled"); + assertFalse(config.isClientEncryptionEnabled()); + assertTrue(config.isSslEnabled()); + config.setMode("login"); + assertTrue(config.isClientEncryptionEnabled()); + } + }

10 years, 4 months

1
0
0 / 0

teiid SVN: r4247 - in branches/7.4.x/engine/src: test/java/org/teiid/query/processor and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: jolee Date: 2012-07-19 16:28:45 -0400 (Thu, 19 Jul 2012) New Revision: 4247 Modified: branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleImplementJoinStrategy.java branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java Log: TEIID-2107 fix for left outer join with index issue Modified: branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleImplementJoinStrategy.java =================================================================== --- branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleImplementJoinStrategy.java 2012-07-19 16:37:08 UTC (rev 4246) +++ branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleImplementJoinStrategy.java 2012-07-19 20:28:45 UTC (rev 4247) @@ -162,7 +162,6 @@ if (joinCriteria == null || joinCriteria.isEmpty()) { joinCriteria = new ArrayList<Criteria>(); joinCriteria.add(cc); - joinNode.setProperty(Info.JOIN_TYPE, JoinType.JOIN_INNER); } } joinNode.setProperty(Info.NON_EQUI_JOIN_CRITERIA, joinCriteria); Modified: branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java =================================================================== --- branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java 2012-07-19 16:37:08 UTC (rev 4246) +++ branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java 2012-07-19 20:28:45 UTC (rev 4247) @@ -336,6 +336,7 @@ execute("insert into x (e2, e1) values (2, 'b')", new List[] {Arrays.asList(1)}); //$NON-NLS-1$ execute("insert into x1 (e2, e1) values (3, 'b')", new List[] {Arrays.asList(1)}); //$NON-NLS-1$ execute("select x.e1 from x makenotdep, x1 makenotdep where x.e2 = x1.e2 and x.e1 = x1.e1", new List[0]); //$NON-NLS-1$ + execute("select x.e1 from x left outer join x1 on x.e2 = x1.e2 and x.e1 = x1.e1", new List[] {Arrays.asList("b")}); //$NON-NLS-1$ } private void sampleTable() throws Exception {

10 years, 4 months

1
0
0 / 0

teiid SVN: r4246 - in trunk/engine/src: test/java/org/teiid/query/processor and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2012-07-19 12:37:08 -0400 (Thu, 19 Jul 2012) New Revision: 4246 Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleImplementJoinStrategy.java trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java Log: TEIID-2107 fix for left outer join with index issue Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleImplementJoinStrategy.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleImplementJoinStrategy.java 2012-07-19 15:47:33 UTC (rev 4245) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleImplementJoinStrategy.java 2012-07-19 16:37:08 UTC (rev 4246) @@ -162,7 +162,6 @@ if (joinCriteria == null || joinCriteria.isEmpty()) { joinCriteria = new ArrayList<Criteria>(); joinCriteria.add(cc); - joinNode.setProperty(Info.JOIN_TYPE, JoinType.JOIN_INNER); } } joinNode.setProperty(Info.NON_EQUI_JOIN_CRITERIA, joinCriteria); Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java 2012-07-19 15:47:33 UTC (rev 4245) +++ trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java 2012-07-19 16:37:08 UTC (rev 4246) @@ -475,6 +475,7 @@ execute("insert into x (e2, e1) values (2, 'b')", new List[] {Arrays.asList(1)}); //$NON-NLS-1$ execute("insert into x1 (e2, e1) values (3, 'b')", new List[] {Arrays.asList(1)}); //$NON-NLS-1$ execute("select x.e1 from x makenotdep, x1 makenotdep where x.e2 = x1.e2 and x.e1 = x1.e1", new List[0]); //$NON-NLS-1$ + execute("select x.e1 from x left outer join x1 on x.e2 = x1.e2 and x.e1 = x1.e1", new List[] {Arrays.asList("b")}); //$NON-NLS-1$ } private void sampleTable() throws Exception {

10 years, 4 months

1
0
0 / 0

teiid SVN: r4245 - in trunk: engine/src/main/java/org/teiid and 21 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2012-07-19 11:47:33 -0400 (Thu, 19 Jul 2012) New Revision: 4245 Added: trunk/engine/src/main/java/org/teiid/query/metadata/SystemMetadata.java Removed: trunk/engine/src/main/java/org/teiid/datatypes/ trunk/jboss-integration/src/main/java/org/teiid/jboss/SystemVDBDeployer.java trunk/jboss-integration/src/main/java/org/teiid/jboss/SystemVDBService.java trunk/metadata/src/main/resources/System.vdb Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java trunk/engine/src/main/java/org/teiid/query/metadata/DDLStringVisitor.java trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj trunk/engine/src/main/resources/org/teiid/metadata/SYS.sql trunk/engine/src/main/resources/org/teiid/metadata/SYSADMIN.sql trunk/engine/src/test/java/org/teiid/query/metadata/TestDDLStringVisitor.java trunk/engine/src/test/java/org/teiid/query/parser/TestDDLParser.java trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidServiceNames.java trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedConfiguration.java trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViewAliasing.java trunk/test-integration/common/src/test/resources/TestCase3473/testGetCrossReference.expected trunk/test-integration/common/src/test/resources/TestCase3473/testGetExportedKeys.expected trunk/test-integration/common/src/test/resources/TestCase3473/testGetImportedKeys.expected trunk/test-integration/common/src/test/resources/TestCase3473/testGetPrimaryKeys.expected trunk/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns2.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns3.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns4.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumnsSingleMatch.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetCrossReference.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetCrossReferenceWithEscape.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeys.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeysWithEscape.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeys.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeysWithEscape.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetIndexInfo.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetIndexInfoWithEscape.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetPrimaryKeys.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetPrimaryKeysWithEscape.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedureColumns.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedures.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProceduresWithEscape.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetSchemas.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTable.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableMultipleTypes.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableTypes.expected trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_NAMESPACE.expected trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testCrossReference.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testExportedKeys.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testImportedKeys.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testIndexInfo.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testPrimaryKeys.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedureColumns.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedures.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testSchemas.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected Log: TEIID-2103 fully switching over to ddl based system metadata Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java =================================================================== --- trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java 2012-07-19 15:47:33 UTC (rev 4245) @@ -482,9 +482,7 @@ writeAttribute(writer, Element.NAME.getLocalName(), translator.getName()); writeAttribute(writer, Element.TYPE.getLocalName(), translator.getType()); - if (translator.getDescription() != null) { - writeAttribute(writer, Element.DESCRIPTION.getLocalName(), translator.getDescription()); - } + writeAttribute(writer, Element.DESCRIPTION.getLocalName(), translator.getDescription()); writeProperties(writer, translator.getProperties()); @@ -497,9 +495,7 @@ writeAttribute(writer, Element.TYPE.getLocalName(), model.getModelType().name()); writeAttribute(writer, Element.VISIBLE.getLocalName(), String.valueOf(model.isVisible())); - if (model.getPath() != null) { - writeAttribute(writer, Element.PATH.getLocalName(), model.getPath()); - } + writeAttribute(writer, Element.PATH.getLocalName(), model.getPath()); if (model.getDescription() != null) { writeElement(writer, Element.DESCRIPTION, model.getDescription()); @@ -526,9 +522,7 @@ for (Message ve:model.getMessages(false)) { writer.writeStartElement(Element.VALIDATION_ERROR.getLocalName()); writeAttribute(writer, Element.VALIDATION_SEVERITY_ATTR.getLocalName(), ve.getSeverity().name()); - if (ve.getPath() != null) { - writeAttribute(writer, Element.PATH.getLocalName(), ve.getPath()); - } + writeAttribute(writer, Element.PATH.getLocalName(), ve.getPath()); writer.writeCharacters(ve.getValue()); writer.writeEndElement(); } Modified: trunk/engine/src/main/java/org/teiid/query/metadata/DDLStringVisitor.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/DDLStringVisitor.java 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/engine/src/main/java/org/teiid/query/metadata/DDLStringVisitor.java 2012-07-19 15:47:33 UTC (rev 4245) @@ -140,7 +140,8 @@ buffer.append(VIEW); } buffer.append(SPACE); - buffer.append(table.getName()); + String name = SQLStringVisitor.escapeSinglePart(table.getName()); + buffer.append(name); if (table.getColumns() != null) { buffer.append(SPACE); @@ -179,15 +180,15 @@ buffer.append(SQLConstants.Tokens.SEMICOLON); if (table.isInsertPlanEnabled()) { - buildTrigger(table.getName(), INSERT, table.getInsertPlan()); + buildTrigger(name, INSERT, table.getInsertPlan()); } if (table.isUpdatePlanEnabled()) { - buildTrigger(table.getName(), UPDATE, table.getUpdatePlan()); + buildTrigger(name, UPDATE, table.getUpdatePlan()); } if (table.isDeletePlanEnabled()) { - buildTrigger(table.getName(), DELETE, table.getDeletePlan()); + buildTrigger(name, DELETE, table.getDeletePlan()); } } @@ -379,17 +380,21 @@ } } - if (column.getDefaultValue() != null) { - buffer.append(SPACE).append(DEFAULT).append(SPACE).append(TICK).append(StringUtil.replaceAll(column.getDefaultValue(), TICK, TICK + TICK)).append(TICK); - } + appendDefault(column); // options appendColumnOptions(buffer, column); } + private void appendDefault(BaseColumn column) { + if (column.getDefaultValue() != null) { + buffer.append(SPACE).append(DEFAULT).append(SPACE).append(TICK).append(StringUtil.replaceAll(column.getDefaultValue(), TICK, TICK + TICK)).append(TICK); + } + } + private void appendColumn(StringBuilder builder, BaseColumn column, boolean includeName, boolean includeType) { if (includeName) { - builder.append(column.getName()); + builder.append(SQLStringVisitor.escapeSinglePart(column.getName())); } if (includeType) { String runtimeTypeName = column.getDatatype().getRuntimeTypeName(); @@ -521,7 +526,7 @@ else { buffer.append(FOREIGN); } - buffer.append(SPACE).append(PROCEDURE).append(SPACE).append(procedure.getName()); + buffer.append(SPACE).append(PROCEDURE).append(SPACE).append(SQLStringVisitor.escapeSinglePart(procedure.getName())); buffer.append(LPAREN); boolean first = true; @@ -590,6 +595,7 @@ if (type == Type.ReturnValue) { buffer.append(SPACE).append(NonReserved.RESULT); } + appendDefault(param); appendColumnOptions(buffer, param); } @@ -604,7 +610,7 @@ else { buffer.append(VIRTUAL); } - buffer.append(SPACE).append(FUNCTION).append(SPACE).append(function.getName()); + buffer.append(SPACE).append(FUNCTION).append(SPACE).append(SQLStringVisitor.escapeSinglePart(function.getName())); buffer.append(LPAREN); boolean first = true; @@ -660,7 +666,7 @@ } private void visit(FunctionParameter param) { - buffer.append(param.getName()).append(SPACE).append(param.getType()); + buffer.append(SQLStringVisitor.escapeSinglePart(param.getName())).append(SPACE).append(param.getType()); } public String toString() { Copied: trunk/engine/src/main/java/org/teiid/query/metadata/SystemMetadata.java (from rev 4243, trunk/engine/src/main/java/org/teiid/datatypes/SystemDataTypes.java) =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/SystemMetadata.java (rev 0) +++ trunk/engine/src/main/java/org/teiid/query/metadata/SystemMetadata.java 2012-07-19 15:47:33 UTC (rev 4245) @@ -0,0 +1,175 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ +package org.teiid.query.metadata; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import org.teiid.adminapi.impl.ModelMetaData; +import org.teiid.adminapi.impl.VDBMetaData; +import org.teiid.core.TeiidRuntimeException; +import org.teiid.core.types.DataTypeManager; +import org.teiid.core.types.DataTypeManager.DefaultDataTypes; +import org.teiid.core.util.Assertion; +import org.teiid.core.util.PropertiesUtils; +import org.teiid.metadata.Datatype; +import org.teiid.metadata.MetadataFactory; +import org.teiid.metadata.MetadataStore; +import org.teiid.metadata.Table; +import org.teiid.query.parser.ParseException; +import org.teiid.query.parser.QueryParser; +import org.teiid.query.validator.ValidatorReport; +import org.teiid.translator.TranslatorException; + +public class SystemMetadata { + + private static SystemMetadata INSTANCE = new SystemMetadata(); + + public static SystemMetadata getInstance() { + return INSTANCE; + } + + private List<Datatype> dataTypes = new ArrayList<Datatype>(); + private Map<String, Datatype> typeMap = new HashMap<String, Datatype>(); + private MetadataStore systemStore; + + public SystemMetadata() { + InputStream is = SystemMetadata.class.getClassLoader().getResourceAsStream("org/teiid/metadata/types.dat"); //$NON-NLS-1$ + try { + InputStreamReader isr = new InputStreamReader(is, Charset.forName("UTF-8")); //$NON-NLS-1$ + BufferedReader br = new BufferedReader(isr); + String s = br.readLine(); + String[] props = s.split("\\|"); //$NON-NLS-1$ + while ((s = br.readLine()) != null) { + Datatype dt = new Datatype(); + String[] vals = s.split("\\|"); //$NON-NLS-1$ + Properties p = new Properties(); + for (int i = 0; i < props.length; i++) { + if (vals[i].length() != 0) { + p.setProperty(props[i], new String(vals[i])); + } + } + PropertiesUtils.setBeanProperties(dt, p, null); + dataTypes.add(dt); + if (dt.isBuiltin()) { + typeMap.put(dt.getRuntimeTypeName(), dt); + } + } + is.close(); + } catch (IOException e) { + throw new TeiidRuntimeException(e); + } finally { + try { + is.close(); + } catch (IOException e) { + throw new TeiidRuntimeException(e); + } + } + addAliasType(DataTypeManager.DataTypeAliases.BIGINT); + addAliasType(DataTypeManager.DataTypeAliases.DECIMAL); + addAliasType(DataTypeManager.DataTypeAliases.REAL); + addAliasType(DataTypeManager.DataTypeAliases.SMALLINT); + addAliasType(DataTypeManager.DataTypeAliases.TINYINT); + addAliasType(DataTypeManager.DataTypeAliases.VARCHAR); + for (String name : DataTypeManager.getAllDataTypeNames()) { + if (!name.equals(DefaultDataTypes.NULL)) { + Assertion.isNotNull(typeMap.get(name), name); + } + } + + VDBMetaData vdb = new VDBMetaData(); + vdb.setName("System"); //$NON-NLS-1$ + vdb.setVersion(1); + Properties p = new Properties(); + systemStore = loadSchema(vdb, p, "SYS").asMetadataStore(); //$NON-NLS-1$ + systemStore.addDataTypes(dataTypes); + loadSchema(vdb, p, "SYSADMIN").mergeInto(systemStore); //$NON-NLS-1$ + MetadataValidator validator = new MetadataValidator(); + ValidatorReport report = validator.validate(vdb, systemStore); + if (report.hasItems()) { + throw new TeiidRuntimeException(report.getFailureMessage()); + } + } + + private MetadataFactory loadSchema(VDBMetaData vdb, Properties p, String name) { + ModelMetaData mmd = new ModelMetaData(); + mmd.setName(name); + vdb.addModel(mmd); + InputStream is = SystemMetadata.class.getClassLoader().getResourceAsStream("org/teiid/metadata/"+name+".sql"); //$NON-NLS-1$ //$NON-NLS-2$ + try { + MetadataFactory factory = new MetadataFactory(vdb.getName(), vdb.getVersion(), name, typeMap, p, null) { + @Override + public Table addTable(String name) throws TranslatorException { + Table t = super.addTable(name); + t.setSystem(true); + return t; + } + }; + QueryParser.getQueryParser().parseDDL(factory, new InputStreamReader(is, Charset.forName("UTF-8"))); //$NON-NLS-1$ + return factory; + } catch (ParseException e) { + throw new TeiidRuntimeException(e); + } finally { + try { + is.close(); + } catch (IOException e) { + throw new TeiidRuntimeException(e); + } + } + } + + private void addAliasType(String alias) { + Class<?> typeClass = DataTypeManager.getDataTypeClass(alias); + String primaryType = DataTypeManager.getDataTypeName(typeClass); + Datatype dt = typeMap.get(primaryType); + Assertion.isNotNull(dt, alias); + typeMap.put(alias, dt); + } + + /** + * List of all "built-in" datatypes. Note that the datatype names do not necessarily match the corresponding runtime type names i.e. int vs. integer + * @return + */ + public List<Datatype> getDataTypes() { + return dataTypes; + } + + /** + * Map of runtime types and aliases to built-in datatypes + * @return + */ + public Map<String, Datatype> getBuiltinTypeMap() { + return typeMap; + } + + public MetadataStore getSystemStore() { + return systemStore; + } +} Property changes on: trunk/engine/src/main/java/org/teiid/query/metadata/SystemMetadata.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj =================================================================== --- trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj 2012-07-19 15:47:33 UTC (rev 4245) @@ -3938,8 +3938,8 @@ typeToken = <TIME> | typeToken = <TIMESTAMP> | typeToken = <OBJECT> | - typeToken = <BLOB> | - typeToken = <CLOB> | + (typeToken = <BLOB> ([<LPAREN>lengthToken=<INTEGERVAL><RPAREN>]) {precision = false;} )| + (typeToken = <CLOB> ([<LPAREN>lengthToken=<INTEGERVAL><RPAREN>]) {precision = false;} )| (typeToken = <VARBINARY> ([<LPAREN>lengthToken=<INTEGERVAL><RPAREN>]) {precision = false;} ) | typeToken = <XML> @@ -4179,6 +4179,8 @@ ParsedDataType type = null; ProcedureParameter.Type ppType = ProcedureParameter.Type.In; ProcedureParameter param = null; + String defaultValue = null; + Boolean notNull = null; } { [((<IN> {ppType = ProcedureParameter.Type.In ;}) @@ -4186,6 +4188,7 @@ |(<INOUT> {ppType = ProcedureParameter.Type.InOut;}))] name = id() type = parseDataType() + [<NOT> <NULL> {notNull = true;}] [nonReserved("RESULT") { if (ppType != ProcedureParameter.Type.Out) { @@ -4198,10 +4201,14 @@ try { param = factory.addProcedureParameter(validateElementName(name), type.type, ppType, proc); setTypeInfo(type, param); + if (notNull != null) { + param.setNullType(Column.NullType.No_Nulls); + } } catch (TranslatorException e){ throw new ParseException(e.getMessage()); } } + [<DEFAULT_KEYWORD> defaultValue = stringVal() {param.setDefaultValue(defaultValue);}] [optionsClause(param, factory) { setColumnOptions(param); @@ -4229,7 +4236,7 @@ { column = addProcColumn(factory, proc, name, type, rs); } - [<NOT> <NULL> { notNull = true; }] + [<NOT> <NULL> {column.setNullType(Column.NullType.No_Nulls);}] [optionsClause(column, factory) { setColumnOptions(column); @@ -4449,7 +4456,7 @@ })+ |(<PRIMARY> nonReserved("KEY") { pk = true; }) ]) - [<DEFAULT_KEYWORD> defalt = stringVal()] + [<DEFAULT_KEYWORD> defalt = stringVal() {column.setDefaultValue(defalt);}] [optionsClause(column, factory) { setColumnOptions(column); @@ -4477,9 +4484,6 @@ column.setAutoIncremented(autoIncrement); column.setNullType(notNull?Column.NullType.No_Nulls:Column.NullType.Nullable); - if (defalt != null){ - column.setDefaultValue(defalt); - } } } Modified: trunk/engine/src/main/resources/org/teiid/metadata/SYS.sql =================================================================== --- trunk/engine/src/main/resources/org/teiid/metadata/SYS.sql 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/engine/src/main/resources/org/teiid/metadata/SYS.sql 2012-07-19 15:47:33 UTC (rev 4245) @@ -24,7 +24,7 @@ Format string(255), DefaultValue string(255), JavaClass string(500) NOT NULL, - Precision integer NOT NULL, + "Precision" integer NOT NULL, CharOctetLength integer, Radix integer NOT NULL, UID string(50) NOT NULL, @@ -44,7 +44,7 @@ IsSigned boolean NOT NULL, IsAutoIncremented boolean NOT NULL, IsCaseSensitive boolean NOT NULL, - Precision integer NOT NULL, + "Precision" integer NOT NULL, Radix integer, SearchType string(20) NOT NULL, UID string(50) NOT NULL, @@ -90,7 +90,7 @@ Position integer NOT NULL, Type string(100) NOT NULL, Optional boolean NOT NULL, - Precision integer NOT NULL, + "Precision" integer NOT NULL, TypeLength integer NOT NULL, Scale integer NOT NULL, Radix integer NOT NULL, @@ -113,7 +113,7 @@ CREATE FOREIGN TABLE Properties ( Name string(255) NOT NULL, - Value string(255) NOT NULL, + "Value" string(255) NOT NULL, UID string(50) NOT NULL, OID integer NOT NULL, ClobValue clob(2097152) Modified: trunk/engine/src/main/resources/org/teiid/metadata/SYSADMIN.sql =================================================================== --- trunk/engine/src/main/resources/org/teiid/metadata/SYSADMIN.sql 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/engine/src/main/resources/org/teiid/metadata/SYSADMIN.sql 2012-07-19 15:47:33 UTC (rev 4245) @@ -15,13 +15,13 @@ contents blob ); -CREATE FOREIGN PROCEDURE isLoggable(OUT loggable boolean NOT NULL RESULT, IN level string NOT NULL, IN context string NOT NULL) +CREATE FOREIGN PROCEDURE isLoggable(OUT loggable boolean NOT NULL RESULT, IN level string NOT NULL DEFAULT 'DEBUG', IN context string NOT NULL DEFAULT 'org.teiid.PROCESSOR') OPTIONS (UPDATECOUNT 0) -CREATE FOREIGN PROCEDURE logMsg(OUT logged boolean NOT NULL RESULT, IN level string NOT NULL, IN context string NOT NULL, IN msg object NOT NULL) +CREATE FOREIGN PROCEDURE logMsg(OUT logged boolean NOT NULL RESULT, IN level string NOT NULL DEFAULT 'DEBUG', IN context string NOT NULL DEFAULT 'org.teiid.PROCESSOR', IN msg object NOT NULL) OPTIONS (UPDATECOUNT 0) -CREATE FOREIGN PROCEDURE refreshMatView(IN ViewName string NOT NULL, IN Invalidate boolean NOT NULL, OUT RowsUpdated integer NOT NULL RESULT) +CREATE FOREIGN PROCEDURE refreshMatView(IN ViewName string NOT NULL, IN Invalidate boolean NOT NULL DEFAULT 'false', OUT RowsUpdated integer NOT NULL RESULT) OPTIONS (UPDATECOUNT 0) CREATE FOREIGN PROCEDURE refreshMatViewRow(IN ViewName string NOT NULL, IN Key object NOT NULL, OUT RowsUpdated integer NOT NULL RESULT) @@ -30,7 +30,7 @@ CREATE FOREIGN PROCEDURE setColumnStats(IN tableName string NOT NULL, IN columnName string NOT NULL, IN distinctCount integer, IN nullCount integer, IN max string, IN min string) OPTIONS (UPDATECOUNT 0) -CREATE FOREIGN PROCEDURE setProperty(OUT OldValue clob(2097152) NOT NULL RESULT, IN UID string(50) NOT NULL, IN Name string NOT NULL, IN Value clob(2097152)) +CREATE FOREIGN PROCEDURE setProperty(OUT OldValue clob(2097152) NOT NULL RESULT, IN UID string(50) NOT NULL, IN Name string NOT NULL, IN "Value" clob(2097152)) OPTIONS (UPDATECOUNT 0) CREATE FOREIGN PROCEDURE setTableStats(IN tableName string NOT NULL, IN cardinality integer NOT NULL) Modified: trunk/engine/src/test/java/org/teiid/query/metadata/TestDDLStringVisitor.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/metadata/TestDDLStringVisitor.java 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/engine/src/test/java/org/teiid/query/metadata/TestDDLStringVisitor.java 2012-07-19 15:47:33 UTC (rev 4245) @@ -122,14 +122,14 @@ @Test public void testFK() throws Exception { - String ddl = "CREATE FOREIGN TABLE G1(g1e1 integer, g1e2 varchar CONSTRAINT PRIMARY KEY(g1e1, g1e2));\n" + + String ddl = "CREATE FOREIGN TABLE G1(\"g1-e1\" integer, g1e2 varchar CONSTRAINT PRIMARY KEY(\"g1-e1\", g1e2));\n" + "CREATE FOREIGN TABLE G2( g2e1 integer, g2e2 varchar CONSTRAINT " + "FOREIGN KEY (g2e1, g2e2) REFERENCES G1 (g1e1, g1e2))"; String expected = "CREATE FOREIGN TABLE G1 (\n" + - " g1e1 integer,\n" + + " \"g1-e1\" integer,\n" + " g1e2 string\n" + - " CONSTRAINT PRIMARY KEY(g1e1, g1e2)\n" + + " CONSTRAINT PRIMARY KEY(\"g1-e1\", g1e2)\n" + ");\n" + "\n" + "CREATE FOREIGN TABLE G2 (\n" + @@ -143,10 +143,10 @@ @Test public void testOptionalFK() throws Exception { - String ddl = "CREATE FOREIGN TABLE G1(g1e1 integer, g1e2 varchar CONSTRAINT PRIMARY KEY(g1e1, g1e2));\n" + + String ddl = "CREATE FOREIGN TABLE \"G1+\"(g1e1 integer, g1e2 varchar CONSTRAINT PRIMARY KEY(g1e1, g1e2));\n" + "CREATE FOREIGN TABLE G2( g2e1 integer, g2e2 varchar CONSTRAINT PRIMARY KEY(g2e1, g2e2)," + "FOREIGN KEY (g2e1, g2e2) REFERENCES G1)"; - String expected = "CREATE FOREIGN TABLE G1 (\n" + + String expected = "CREATE FOREIGN TABLE \"G1+\" (\n" + " g1e1 integer,\n" + " g1e2 string\n" + " CONSTRAINT PRIMARY KEY(g1e1, g1e2)\n" + Modified: trunk/engine/src/test/java/org/teiid/query/parser/TestDDLParser.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/parser/TestDDLParser.java 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/engine/src/test/java/org/teiid/query/parser/TestDDLParser.java 2012-07-19 15:47:33 UTC (rev 4245) @@ -32,10 +32,10 @@ import org.teiid.adminapi.impl.ModelMetaData; import org.teiid.adminapi.impl.VDBMetaData; import org.teiid.core.util.ObjectConverterUtil; -import org.teiid.datatypes.SystemDataTypes; import org.teiid.metadata.*; import org.teiid.metadata.BaseColumn.NullType; import org.teiid.query.metadata.MetadataValidator; +import org.teiid.query.metadata.SystemMetadata; import org.teiid.query.validator.ValidatorReport; //import static org.junit.Assert.*; @@ -630,7 +630,7 @@ } public static Map<String, Datatype> getDataTypes() { - return SystemDataTypes.getInstance().getBuiltinTypeMap(); + return SystemMetadata.getInstance().getBuiltinTypeMap(); } @Test public void testKeyResolve() { Deleted: trunk/jboss-integration/src/main/java/org/teiid/jboss/SystemVDBDeployer.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/SystemVDBDeployer.java 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/SystemVDBDeployer.java 2012-07-19 15:47:33 UTC (rev 4245) @@ -1,91 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ -package org.teiid.jboss; - -import java.io.Closeable; -import java.io.IOException; -import java.io.InputStream; -import java.net.URISyntaxException; -import java.util.concurrent.Executors; - -import org.jboss.vfs.TempFileProvider; -import org.jboss.vfs.VFS; -import org.jboss.vfs.VirtualFile; -import org.teiid.core.CoreConstants; -import org.teiid.core.TeiidRuntimeException; -import org.teiid.deployers.VDBRepository; -import org.teiid.metadata.index.IndexMetadataStore; -import org.teiid.metadata.index.RuntimeMetadataPlugin; -import org.teiid.runtime.RuntimePlugin; - - -public class SystemVDBDeployer { - private VDBRepository vdbRepository; - private Closeable file; - - private static final TempFileProvider PROVIDER; - static { - try { - PROVIDER = TempFileProvider.create("teiid-deployment", Executors.newScheduledThreadPool(2)); //$NON-NLS-1$ - } - catch (final IOException ioe) { - throw new RuntimeException("Failed to create temp file provider");//$NON-NLS-1$ - } - } - - public void start() { - try { - VirtualFile mountPoint = VFS.getChild("content/" + CoreConstants.SYSTEM_VDB); //$NON-NLS-1$ - if (!mountPoint.exists()) { - InputStream contents = Thread.currentThread().getContextClassLoader().getResourceAsStream(CoreConstants.SYSTEM_VDB); - if (contents == null) { - throw new TeiidRuntimeException(RuntimePlugin.Event.TEIID40021, RuntimeMetadataPlugin.Util.gs(RuntimePlugin.Event.TEIID40021)); - } - this.file = VFS.mountZip(contents, CoreConstants.SYSTEM_VDB, mountPoint, PROVIDER); - } - - IndexMetadataStore idxStore = new IndexMetadataStore(mountPoint); - idxStore.load(null, null); - - // uri conversion is only to remove the spaces in URL, note this only with above kind situation - this.vdbRepository.setSystemStore(idxStore); - } catch (URISyntaxException e) { - throw new TeiidRuntimeException(RuntimePlugin.Event.TEIID40022, e, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40022)); - } catch (IOException e) { - throw new TeiidRuntimeException(RuntimePlugin.Event.TEIID40022, e, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40022)); - } - } - - public void setVDBRepository(VDBRepository repo) { - this.vdbRepository = repo; - } - - public void stop() { - try { - if (file != null) { - file.close(); - } - } catch (IOException e) { - //ignore - } - } -} Deleted: trunk/jboss-integration/src/main/java/org/teiid/jboss/SystemVDBService.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/SystemVDBService.java 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/SystemVDBService.java 2012-07-19 15:47:33 UTC (rev 4245) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ -package org.teiid.jboss; - -import org.jboss.msc.service.Service; -import org.jboss.msc.service.StartContext; -import org.jboss.msc.service.StartException; -import org.jboss.msc.service.StopContext; - -class SystemVDBService implements Service<SystemVDBDeployer> { - private SystemVDBDeployer deployer; - - public SystemVDBService(SystemVDBDeployer deployer){ - this.deployer = deployer; - } - - @Override - public void start(StartContext context) throws StartException { - deployer.start(); - } - - @Override - public void stop(StopContext context) { - deployer.stop(); - } - - @Override - public SystemVDBDeployer getValue() throws IllegalStateException, IllegalArgumentException { - return deployer; - } - -} Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java 2012-07-19 15:47:33 UTC (rev 4245) @@ -233,12 +233,6 @@ statusBuilder.addDependency(TeiidServiceNames.VDB_REPO, VDBRepository.class, statusChecker.vdbRepoInjector); newControllers.add(statusBuilder.install()); - // System VDB Service - SystemVDBDeployer systemVDB = new SystemVDBDeployer(); - systemVDB.setVDBRepository(vdbRepository); - SystemVDBService systemVDBService = new SystemVDBService(systemVDB); - newControllers.add(target.addService(TeiidServiceNames.SYSTEM_VDB, systemVDBService).install()); - newControllers.add(RelativePathService.addService(TeiidServiceNames.DATA_DIR, "teiid-data", "jboss.server.data.dir", target)); //$NON-NLS-1$ //$NON-NLS-2$ final ObjectsSerializerService serializer = new ObjectsSerializerService(); ServiceBuilder<ObjectSerializer> objectSerializerService = target.addService(TeiidServiceNames.OBJECT_SERIALIZER, serializer); @@ -356,7 +350,6 @@ engineBuilder.addDependency(ServiceName.JBOSS.append("txn", "XATerminator"), XATerminator.class, engine.getXaTerminatorInjector()); //$NON-NLS-1$ //$NON-NLS-2$ engineBuilder.addDependency(ServiceName.JBOSS.append("txn", "TransactionManager"), TransactionManager.class, engine.getTxnManagerInjector()); //$NON-NLS-1$ //$NON-NLS-2$ engineBuilder.addDependency(TeiidServiceNames.BUFFER_MGR, BufferManager.class, engine.getBufferManagerInjector()); - engineBuilder.addDependency(TeiidServiceNames.SYSTEM_VDB, SystemVDBDeployer.class, new InjectedValue<SystemVDBDeployer>()); engineBuilder.addDependency(TeiidServiceNames.TRANSLATOR_REPO, TranslatorRepository.class, engine.getTranslatorRepositoryInjector()); engineBuilder.addDependency(TeiidServiceNames.VDB_REPO, VDBRepository.class, engine.getVdbRepositoryInjector()); engineBuilder.addDependency(TeiidServiceNames.AUTHORIZATION_VALIDATOR, AuthorizationValidator.class, engine.getAuthorizationValidatorInjector()); Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidServiceNames.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidServiceNames.java 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidServiceNames.java 2012-07-19 15:47:33 UTC (rev 4245) @@ -34,7 +34,6 @@ public static ServiceName DATA_DIR = ServiceName.JBOSS.append("teiid", "data.dir");//$NON-NLS-1$ //$NON-NLS-2$ public static ServiceName BUFFER_MGR = ServiceName.JBOSS.append("teiid", "buffer-mgr");//$NON-NLS-1$ //$NON-NLS-2$ public static ServiceName TUPLE_BUFFER = ServiceName.JBOSS.append("teiid", "tuple_buffer");//$NON-NLS-1$ //$NON-NLS-2$ - public static ServiceName SYSTEM_VDB = ServiceName.JBOSS.append("teiid", "system.vdb");//$NON-NLS-1$ //$NON-NLS-2$ public static ServiceName AUTHORIZATION_VALIDATOR = ServiceName.JBOSS.append("teiid", "authorization-validator");//$NON-NLS-1$ //$NON-NLS-2$ private static ServiceName VDB_SVC_BASE = ServiceName.JBOSS.append("teiid", "vdb"); //$NON-NLS-1$ //$NON-NLS-2$ private static ServiceName VDB_FINISHED_SVC_BASE = ServiceName.JBOSS.append("teiid", "vdb-finished"); //$NON-NLS-1$ //$NON-NLS-2$ Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java =================================================================== --- trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java 2012-07-19 15:47:33 UTC (rev 4245) @@ -41,7 +41,6 @@ import org.teiid.core.TeiidRuntimeException; import org.teiid.core.index.IEntryResult; import org.teiid.core.util.StringUtil; -import org.teiid.datatypes.SystemDataTypes; import org.teiid.internal.core.index.Index; import org.teiid.metadata.*; import org.teiid.metadata.FunctionMethod.Determinism; @@ -238,10 +237,6 @@ for (Datatype datatype : systemDatatypes) { uuidToRecord.put(datatype.getUUID(), datatype); } - } else { - for (Datatype datatype : SystemDataTypes.getInstance().getDataTypes()) { - uuidToRecord.put(datatype.getUUID(), datatype); - } } for (AbstractMetadataRecord datatypeRecordImpl : uuidToRecord.values()) { addDatatype((Datatype) datatypeRecordImpl); Deleted: trunk/metadata/src/main/resources/System.vdb =================================================================== (Binary files differ) Modified: trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java =================================================================== --- trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java 2012-07-19 15:47:33 UTC (rev 4245) @@ -36,18 +36,16 @@ import org.jboss.vfs.TempFileProvider; import org.jboss.vfs.VFS; import org.jboss.vfs.VirtualFile; -import org.teiid.core.CoreConstants; import org.teiid.core.TeiidRuntimeException; import org.teiid.core.util.FileUtils; import org.teiid.core.util.LRUCache; -import org.teiid.metadata.Datatype; import org.teiid.metadata.FunctionMethod; -import org.teiid.metadata.MetadataStore; import org.teiid.query.function.FunctionTree; import org.teiid.query.function.SystemFunctionManager; import org.teiid.query.function.UDFSource; import org.teiid.query.function.metadata.FunctionMetadataReader; import org.teiid.query.metadata.CompositeMetadataStore; +import org.teiid.query.metadata.SystemMetadata; import org.teiid.query.metadata.TransformationMetadata; @@ -55,7 +53,6 @@ public class VDBMetadataFactory { public static LRUCache<URL, TransformationMetadata> VDB_CACHE = new LRUCache<URL, TransformationMetadata>(10); - private static MetadataStore system; public static TransformationMetadata getVDBMetadata(String vdbFile) { try { @@ -66,17 +63,6 @@ } } - public static MetadataStore getSystem() { - try { - if (system == null) { - system= loadMetadata( CoreConstants.SYSTEM_VDB, Thread.currentThread().getContextClassLoader().getResource(CoreConstants.SYSTEM_VDB)); - } - return system; - } catch (Exception e) { - throw new TeiidRuntimeException(e, "System VDB load error"); - } - } - public static TransformationMetadata getVDBMetadata(String vdbName, URL vdbURL, URL udfFile) throws IOException { TransformationMetadata vdbmetadata = VDB_CACHE.get(vdbURL); if (vdbmetadata != null) { @@ -84,7 +70,7 @@ } try { - IndexMetadataStore imf = loadMetadata(vdbName, vdbURL, getSystem().getDatatypes().values()); + IndexMetadataStore imf = loadMetadata(vdbName, vdbURL); Collection <FunctionMethod> methods = null; Collection<FunctionTree> trees = null; @@ -94,7 +80,7 @@ trees = Arrays.asList(new FunctionTree(schema, new UDFSource(methods), true)); } SystemFunctionManager sfm = new SystemFunctionManager(); - vdbmetadata = new TransformationMetadata(null, new CompositeMetadataStore(Arrays.asList(getSystem(), imf)), imf.getEntriesPlusVisibilities(), sfm.getSystemFunctions(), trees); + vdbmetadata = new TransformationMetadata(null, new CompositeMetadataStore(Arrays.asList(SystemMetadata.getInstance().getSystemStore(), imf)), imf.getEntriesPlusVisibilities(), sfm.getSystemFunctions(), trees); VDB_CACHE.put(vdbURL, vdbmetadata); return vdbmetadata; } catch (URISyntaxException e) { @@ -104,20 +90,15 @@ } } - public static IndexMetadataStore loadMetadata(String vdbName, URL url, Collection<Datatype> dataTypes) throws IOException, MalformedURLException, URISyntaxException { - VirtualFile root = VFS.getChild(vdbName); + public static IndexMetadataStore loadMetadata(String vdbName, URL url) throws IOException, MalformedURLException, URISyntaxException { + VirtualFile root = VFS.getChild(vdbName); if (!root.exists()) { VFS.mountZip(url.openStream(), vdbName, root, TempFileProvider.create("vdbs", Executors.newScheduledThreadPool(2))); // once done this mount should be closed, since this class is only used testing // it is hard to event when the test is done, otherwise we need to elevate the VFS to top } IndexMetadataStore store = new IndexMetadataStore(root); - store.load(null, dataTypes); + store.load(null, SystemMetadata.getInstance().getDataTypes()); return store; - - } - - public static IndexMetadataStore loadMetadata(String vdbName, URL url) throws IOException, MalformedURLException, URISyntaxException { - return loadMetadata(vdbName, url, null); } } Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2012-07-19 15:47:33 UTC (rev 4245) @@ -39,7 +39,6 @@ import org.teiid.adminapi.impl.VDBMetaData; import org.teiid.core.CoreConstants; import org.teiid.core.util.PropertiesUtils; -import org.teiid.datatypes.SystemDataTypes; import org.teiid.dqp.internal.datamgr.ConnectorManager; import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository; import org.teiid.logging.LogConstants; @@ -49,6 +48,7 @@ import org.teiid.net.ConnectionException; import org.teiid.query.function.SystemFunctionManager; import org.teiid.query.metadata.MetadataValidator; +import org.teiid.query.metadata.SystemMetadata; import org.teiid.query.metadata.TransformationMetadata.Resource; import org.teiid.query.validator.ValidatorReport; import org.teiid.runtime.RuntimePlugin; @@ -64,12 +64,12 @@ private static final int DEFAULT_TIMEOUT_MILLIS = PropertiesUtils.getIntProperty(System.getProperties(), "org.teiid.clientVdbLoadTimeoutMillis", 300000); //$NON-NLS-1$ private NavigableMap<VDBKey, CompositeVDB> vdbRepo = new ConcurrentSkipListMap<VDBKey, CompositeVDB>(); - private MetadataStore systemStore; + private MetadataStore systemStore = SystemMetadata.getInstance().getSystemStore(); private MetadataStore odbcStore; private boolean odbcEnabled = false; private List<VDBLifeCycleListener> listeners = new CopyOnWriteArrayList<VDBLifeCycleListener>(); private SystemFunctionManager systemFunctionManager; - private Map<String, Datatype> datatypeMap = SystemDataTypes.getInstance().getBuiltinTypeMap(); + private Map<String, Datatype> datatypeMap = SystemMetadata.getInstance().getBuiltinTypeMap(); private ReentrantLock lock = new ReentrantLock(); private Condition vdbAdded = lock.newCondition(); Modified: trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedConfiguration.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedConfiguration.java 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedConfiguration.java 2012-07-19 15:47:33 UTC (rev 4245) @@ -30,7 +30,6 @@ import org.teiid.dqp.internal.process.DQPConfiguration; import org.teiid.dqp.internal.process.TeiidExecutor; import org.teiid.dqp.internal.process.ThreadReuseExecutor; -import org.teiid.metadata.MetadataStore; import org.teiid.query.ObjectReplicator; import org.teiid.security.SecurityHelper; @@ -39,7 +38,6 @@ private SecurityHelper securityHelper; private List<String> securityDomains; private TransactionManager transactionManager; - private MetadataStore systemStore; private ObjectReplicator objectReplicator; private WorkManager workManager; private boolean useDisk = true; @@ -70,12 +68,6 @@ public void setTransactionManager(TransactionManager transactionManager) { this.transactionManager = transactionManager; } - public MetadataStore getSystemStore() { - return systemStore; - } - public void setSystemStore(MetadataStore systemStore) { - this.systemStore = systemStore; - } public ObjectReplicator getObjectReplicator() { return objectReplicator; } Modified: trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java 2012-07-19 15:47:33 UTC (rev 4245) @@ -54,7 +54,6 @@ import org.teiid.common.buffer.TupleBufferCache; import org.teiid.core.TeiidRuntimeException; import org.teiid.core.BundleUtil.Event; -import org.teiid.datatypes.SystemDataTypes; import org.teiid.deployers.CompositeVDB; import org.teiid.deployers.UDFMetaData; import org.teiid.deployers.VDBLifeCycleListener; @@ -305,13 +304,6 @@ this.eventDistributorFactoryService.start(); this.dqp.setEventDistributor(this.eventDistributorFactoryService.getReplicatedEventDistributor()); this.replicator = dqpConfiguration.getObjectReplicator(); - if (dqpConfiguration.getSystemStore() == null) { - MetadataStore ms = new MetadataStore(); - ms.addDataTypes(SystemDataTypes.getInstance().getDataTypes()); - this.repo.setSystemStore(ms); - } else { - this.repo.setSystemStore(dqpConfiguration.getSystemStore()); - } if (dqpConfiguration.getTransactionManager() == null) { LogManager.logInfo(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40089)); this.transactionService.setTransactionManager((TransactionManager) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class<?>[] {TransactionManager.class}, new InvocationHandler() { Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java 2012-07-19 15:47:33 UTC (rev 4245) @@ -100,9 +100,6 @@ } public void start(EmbeddedConfiguration config, boolean realBufferMangaer) { - if (config.getSystemStore() == null) { - config.setSystemStore(VDBMetadataFactory.getSystem()); - } if (config.getTransactionManager() == null) { config.setTransactionManager(SimpleMock.createSimpleMock(TransactionManager.class)); this.transactionService.setXaTerminator(SimpleMock.createSimpleMock(XATerminator.class)); Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java 2012-07-19 15:47:33 UTC (rev 4245) @@ -41,7 +41,6 @@ import org.teiid.metadata.Procedure; import org.teiid.metadata.ProcedureParameter; import org.teiid.metadata.Table; -import org.teiid.metadata.index.VDBMetadataFactory; import org.teiid.query.parser.QueryParser; import org.teiid.translator.TranslatorException; import org.teiid.translator.jdbc.teiid.TeiidExecutionFactory; @@ -73,7 +72,6 @@ private MetadataFactory createMetadataFactory(String schema, Properties importProperties) { VDBRepository vdbRepository = new VDBRepository(); - vdbRepository.setSystemStore(VDBMetadataFactory.getSystem()); return new MetadataFactory("vdb", 1, schema, vdbRepository.getBuiltinDatatypes(), importProperties, null); } Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViewAliasing.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViewAliasing.java 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViewAliasing.java 2012-07-19 15:47:33 UTC (rev 4245) @@ -38,7 +38,6 @@ import org.teiid.metadata.MetadataFactory; import org.teiid.metadata.MetadataStore; import org.teiid.metadata.Table; -import org.teiid.metadata.index.VDBMetadataFactory; @SuppressWarnings("nls") public class TestMatViewAliasing { @@ -51,7 +50,6 @@ server = new FakeServer(true); VDBRepository vdbRepository = new VDBRepository(); - vdbRepository.setSystemStore(VDBMetadataFactory.getSystem()); MetadataFactory mf = new MetadataFactory(null, 1, "foo", vdbRepository.getBuiltinDatatypes(), new Properties(), null); mf.getSchema().setPhysical(false); Table mat = mf.addTable("mat"); Modified: trunk/test-integration/common/src/test/resources/TestCase3473/testGetCrossReference.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestCase3473/testGetCrossReference.expected 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/test-integration/common/src/test/resources/TestCase3473/testGetCrossReference.expected 2012-07-19 15:47:33 UTC (rev 4245) @@ -3,73 +3,73 @@ test test all_databases database_id test test all_models database_id 1 3 3 databae_model_fk databases_pk 5 Row Count : 1 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY test test all_databases database_id test test all_models database_id 1 3 3 databae_model_fk databases_pk 5 test test all_models model_id test test all_tables model_id 1 3 3 table_model_fk models_pk 5 Row Count : 2 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false Modified: trunk/test-integration/common/src/test/resources/TestCase3473/testGetExportedKeys.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestCase3473/testGetExportedKeys.expected 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/test-integration/common/src/test/resources/TestCase3473/testGetExportedKeys.expected 2012-07-19 15:47:33 UTC (rev 4245) @@ -3,53 +3,53 @@ test test all_models model_id test test all_tables model_id 1 3 3 table_model_fk models_pk 5 Row Count : 1 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false Modified: trunk/test-integration/common/src/test/resources/TestCase3473/testGetImportedKeys.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestCase3473/testGetImportedKeys.expected 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/test-integration/common/src/test/resources/TestCase3473/testGetImportedKeys.expected 2012-07-19 15:47:33 UTC (rev 4245) @@ -3,53 +3,53 @@ test test all_databases database_id test test all_models database_id 1 3 3 databae_model_fk databases_pk 5 Row Count : 1 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 test java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 test java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 test java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 test java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 test java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 test java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 test java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 test java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 test java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 test java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 test java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 test java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 test java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 test java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false Modified: trunk/test-integration/common/src/test/resources/TestCase3473/testGetPrimaryKeys.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestCase3473/testGetPrimaryKeys.expected 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/test-integration/common/src/test/resources/TestCase3473/testGetPrimaryKeys.expected 2012-07-19 15:47:33 UTC (rev 4245) @@ -3,29 +3,29 @@ test test all_models model_id 1 models_pk Row Count : 1 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -VDBName 12 test java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false false false false 0 true true false false -SchemaName 12 test java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false true 1 false true true true +VDBName 12 test java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false true false false 0 true true false false +SchemaName 12 test java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false false 1 true true false false TableName 12 test java.lang.String TABLE_NAME string SYS KeyColumns 2048 2048 0 false true false false 0 true true false false -Name 12 test java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false false false false 0 true true false false +Name 12 test java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false true false false 0 true true false false KEY_SEQ 5 test java.lang.Short KEY_SEQ short <null> <null> 6 5 0 false false false true 1 false true true true -KeyName 12 test java.lang.String PK_NAME string SYS KeyColumns 255 255 0 false false false false 1 true true false false +KeyName 12 test java.lang.String PK_NAME string SYS KeyColumns 255 255 0 false true false false 1 true true false false string string string string short string TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME KEY_SEQ PK_NAME Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -VDBName 12 test java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false false false false 0 true true false false -SchemaName 12 test java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false true 1 false true true true +VDBName 12 test java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false true false false 0 true true false false +SchemaName 12 test java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false false 1 true true false false TableName 12 test java.lang.String TABLE_NAME string SYS KeyColumns 2048 2048 0 false true false false 0 true true false false -Name 12 test java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false false false false 0 true true false false +Name 12 test java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false true false false 0 true true false false KEY_SEQ 5 test java.lang.Short KEY_SEQ short <null> <null> 6 5 0 false false false true 1 false true true true -KeyName 12 test java.lang.String PK_NAME string SYS KeyColumns 255 255 0 false false false false 1 true true false false +KeyName 12 test java.lang.String PK_NAME string SYS KeyColumns 255 255 0 false true false false 1 true true false false string string string string short string TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME KEY_SEQ PK_NAME Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -VDBName 12 test java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false false false false 0 true true false false -SchemaName 12 test java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false true 1 false true true true +VDBName 12 test java.lang.String TABLE_CAT string SYS KeyColumns 255 255 0 false true false false 0 true true false false +SchemaName 12 test java.lang.String TABLE_SCHEM string SYS KeyColumns 255 255 0 false true false false 1 true true false false TableName 12 test java.lang.String TABLE_NAME string SYS KeyColumns 2048 2048 0 false true false false 0 true true false false -Name 12 test java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false false false false 0 true true false false +Name 12 test java.lang.String COLUMN_NAME string SYS KeyColumns 255 255 0 false true false false 0 true true false false KEY_SEQ 5 test java.lang.Short KEY_SEQ short <null> <null> 6 5 0 false false false true 1 false true true true -KeyName 12 test java.lang.String PK_NAME string SYS KeyColumns 255 255 0 false false false false 1 true true false false +KeyName 12 test java.lang.String PK_NAME string SYS KeyColumns 255 255 0 false true false false 1 true true false false Modified: trunk/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected 2012-07-19 15:47:33 UTC (rev 4245) @@ -31,44 +31,44 @@ test test all_tables TABLE <null> <null> <null> <null> <null> <null> false Row Count : 29 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -VDBName 12 test java.lang.String TABLE_CAT string SYS Tables 255 255 0 false true false true 1 false true true true -SchemaName 12 test java.lang.String TABLE_SCHEM string SYS Tables 255 255 0 false true false true 1 false true true true +VDBName 12 test java.lang.String TABLE_CAT string SYS Tables 255 255 0 false true false false 1 true true false false +SchemaName 12 test java.lang.String TABLE_SCHEM string SYS Tables 255 255 0 false true false false 1 true true false false Name 12 test java.lang.String TABLE_NAME string SYS Tables 255 255 0 false true false false 0 true true false false TABLE_TYPE 12 test java.lang.String TABLE_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true -Description 12 test java.lang.String REMARKS string SYS Tables 255 255 0 false true false true 1 false true true true +Description 12 test java.lang.String REMARKS string SYS Tables 255 255 0 false true false false 1 true true false false TYPE_CAT 12 test java.lang.String TYPE_CAT string <null> <null> 4000 4000 0 false false false true 1 false true true true TYPE_SCHEM 12 test java.lang.String TYPE_SCHEM string <null> <null> 4000 4000 0 false false false true 1 false true true true TYPE_NAME 12 test java.lang.String TYPE_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true SELF_REFERENCING_COL_NAME 12 test java.lang.String SELF_REFERENCING_COL_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true REF_GENERATION 12 test java.lang.String REF_GENERATION string <null> <null> 4000 4000 0 false false false true 1 false true true true -IsPhysical -7 test java.lang.Boolean ISPHYSICAL boolean SYS Tables 5 1 0 false true false false 0 true true false false +IsPhysical -7 test java.lang.Boolean ISPHYSICAL boolean SYS Tables 5 1 0 false false false false 0 true true false false string string string string string string string string string string boolean TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE REMARKS TYPE_CAT TYPE_SCHEM TYPE_NAME SELF_REFERENCING_COL_NAME REF_GENERATION ISPHYSICAL Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -VDBName 12 test java.lang.String TABLE_CAT string SYS Tables 255 255 0 false true false true 1 false true true true -SchemaName 12 test java.lang.String TABLE_SCHEM string SYS Tables 255 255 0 false true false true 1 false true true true +VDBName 12 test java.lang.String TABLE_CAT string SYS Tables 255 255 0 false true false false 1 true true false false +SchemaName 12 test java.lang.String TABLE_SCHEM string SYS Tables 255 255 0 false true false false 1 true true false false Name 12 test java.lang.String TABLE_NAME string SYS Tables 255 255 0 false true false false 0 true true false false TABLE_TYPE 12 test java.lang.String TABLE_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true -Description 12 test java.lang.String REMARKS string SYS Tables 255 255 0 false true false true 1 false true true true +Description 12 test java.lang.String REMARKS string SYS Tables 255 255 0 false true false false 1 true true false false TYPE_CAT 12 test java.lang.String TYPE_CAT string <null> <null> 4000 4000 0 false false false true 1 false true true true TYPE_SCHEM 12 test java.lang.String TYPE_SCHEM string <null> <null> 4000 4000 0 false false false true 1 false true true true TYPE_NAME 12 test java.lang.String TYPE_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true SELF_REFERENCING_COL_NAME 12 test java.lang.String SELF_REFERENCING_COL_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true REF_GENERATION 12 test java.lang.String REF_GENERATION string <null> <null> 4000 4000 0 false false false true 1 false true true true -IsPhysical -7 test java.lang.Boolean ISPHYSICAL boolean SYS Tables 5 1 0 false true false false 0 true true false false +IsPhysical -7 test java.lang.Boolean ISPHYSICAL boolean SYS Tables 5 1 0 false false false false 0 true true false false string string string string string string string string string string boolean TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE REMARKS TYPE_CAT TYPE_SCHEM TYPE_NAME SELF_REFERENCING_COL_NAME REF_GENERATION ISPHYSICAL Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -VDBName 12 test java.lang.String TABLE_CAT string SYS Tables 255 255 0 false true false true 1 false true true true -SchemaName 12 test java.lang.String TABLE_SCHEM string SYS Tables 255 255 0 false true false true 1 false true true true +VDBName 12 test java.lang.String TABLE_CAT string SYS Tables 255 255 0 false true false false 1 true true false false +SchemaName 12 test java.lang.String TABLE_SCHEM string SYS Tables 255 255 0 false true false false 1 true true false false Name 12 test java.lang.String TABLE_NAME string SYS Tables 255 255 0 false true false false 0 true true false false TABLE_TYPE 12 test java.lang.String TABLE_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true -Description 12 test java.lang.String REMARKS string SYS Tables 255 255 0 false true false true 1 false true true true +Description 12 test java.lang.String REMARKS string SYS Tables 255 255 0 false true false false 1 true true false false TYPE_CAT 12 test java.lang.String TYPE_CAT string <null> <null> 4000 4000 0 false false false true 1 false true true true TYPE_SCHEM 12 test java.lang.String TYPE_SCHEM string <null> <null> 4000 4000 0 false false false true 1 false true true true TYPE_NAME 12 test java.lang.String TYPE_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true SELF_REFERENCING_COL_NAME 12 test java.lang.String SELF_REFERENCING_COL_NAME string <null> <null> 4000 4000 0 false false false true 1 false true true true REF_GENERATION 12 test java.lang.String REF_GENERATION string <null> <null> 4000 4000 0 false false false true 1 false true true true -IsPhysical -7 test java.lang.Boolean ISPHYSICAL boolean SYS Tables 5 1 0 false true false false 0 true true false false +IsPhysical -7 test java.lang.Boolean ISPHYSICAL boolean SYS Tables 5 1 0 false false false false 0 true true false false Modified: trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected 2012-07-19 15:47:33 UTC (rev 4245) @@ -1,23 +1,23 @@ string string string string string boolean boolean string integer string boolean boolean integer VDBName SchemaName Name Type NameInSource IsPhysical SupportsUpdates UID Cardinality Description IsSystem IsMaterialized OID -parts SYS Columns Table <null> true false mmuuid:1c9a5cb2-17b1-4e4a-8b0e-3a42bd052509 -1 <null> true false 8 -parts SYS DataTypes Table <null> true false mmuuid:9a8794f9-66f8-49e8-8576-89d212d0f957 -1 <null> true false 9 -parts SYS KeyColumns Table <null> true false mmuuid:14946083-3bd5-42d5-8283-1c0694347c29 -1 <null> true false 10 -parts SYS Keys Table <null> true false mmuuid:1e5135dc-ce5d-4b25-a8ff-63f5440b3108 -1 <null> true false 11 -parts SYSADMIN MatViews Table <null> true false mmuuid:520ba1e8-3553-460f-8d18-9b43f089e256 -1 <null> true false 6 +parts SYS Columns Table <null> true false tid:2cb59cfd55db-9bd42fbd-00000001 -1 <null> true false 6 +parts SYS DataTypes Table <null> true false tid:2cb59cfd55db-6130d2cf-00000021 -1 <null> true false 7 +parts SYS KeyColumns Table <null> true false tid:2cb59cfd55db-c5c6549e-00000035 -1 <null> true false 8 +parts SYS Keys Table <null> true false tid:2cb59cfd55db-0023a214-00000040 -1 <null> true false 9 +parts SYSADMIN MatViews Table <null> true false tid:60b87e792634-14d6450e-00000001 -1 <null> true false 17 parts PartsSupplier PARTSSUPPLIER.PARTS Table PARTS true true mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590 16 <null> false false 1 parts PartsSupplier PARTSSUPPLIER.SHIP_VIA Table SHIP_VIA true true mmuuid:0f4e9b80-73ff-1edc-a81c-ecf397b10590 4 <null> false false 2 parts PartsSupplier PARTSSUPPLIER.STATUS Table STATUS true true mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590 3 <null> false false 3 parts PartsSupplier PARTSSUPPLIER.SUPPLIER Table SUPPLIER true true mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590 16 <null> false false 4 parts PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS Table SUPPLIER_PARTS true true mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590 227 <null> false false 5 -parts SYS ProcedureParams Table <null> true false mmuuid:a56bd7fe-c87a-411c-8f5d-661975a25626 -1 <null> true false 12 -parts SYS Procedures Table <null> true false mmuuid:0bc132a5-9f8d-4a3c-9f5d-98156a98a962 -1 <null> true false 13 -parts SYS Properties Table <null> true false mmuuid:7a45e50a-d03f-4548-ba35-761651bbca85 -1 <null> true false 14 -parts SYS ReferenceKeyColumns Table <null> true false mmuuid:6a9653e8-a337-41b2-86fa-77b98f409a29 -1 <null> true false 15 -parts SYS Schemas Table <null> true false mmuuid:8648a554-b2ad-4e8e-84ca-2ec618b311a9 -1 <null> true false 16 -parts SYS Tables Table <null> true false mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7 -1 <null> true false 17 -parts SYSADMIN VDBResources Table <null> true false mmuuid:1785804d-beaf-4831-9531-e59164fedd49 -1 <null> true false 7 -parts SYS VirtualDatabases Table <null> true false mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489 -1 <null> true false 18 +parts SYS ProcedureParams Table <null> true false tid:2cb59cfd55db-ab347619-0000004c -1 <null> true false 10 +parts SYS Procedures Table <null> true false tid:2cb59cfd55db-8f29b420-0000005d -1 <null> true false 11 +parts SYS Properties Table <null> true false tid:2cb59cfd55db-3f9f6953-00000066 -1 <null> true false 12 +parts SYS ReferenceKeyColumns Table <null> true false tid:2cb59cfd55db-aa92fa09-0000006c -1 <null> true false 13 +parts SYS Schemas Table <null> true false tid:2cb59cfd55db-d57e16d2-0000007b -1 <null> true false 14 +parts SYS Tables Table <null> true false tid:2cb59cfd55db-94dc2a85-00000083 -1 <null> true false 15 +parts SYSADMIN VDBResources Table <null> true false tid:60b87e792634-1e9b1131-0000000b -1 <null> true false 18 +parts SYS VirtualDatabases Table <null> true false tid:2cb59cfd55db-a9e11fad-00000091 -1 <null> true false 16 parts pg_catalog matpg_datatype Table <null> false false tid:7ff2755e9621-e544c1cc-00000068 -1 <null> true true 19 parts pg_catalog matpg_relatt Table <null> false false tid:7ff2755e9621-75d65150-0000005e -1 <null> true true 20 parts pg_catalog pg_am Table <null> false false tid:7ff2755e9621-065a8b74-00000031 -1 <null> true false 21 @@ -33,16 +33,16 @@ parts pg_catalog pg_user Table <null> false false tid:7ff2755e9621-d9eeb913-00000059 -1 <null> true false 31 Row Count : 31 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -VDBName 12 parts java.lang.String VDBName string SYS Tables 255 255 0 false true false true 1 false true true true -SchemaName 12 parts java.lang.String SchemaName string SYS Tables 255 255 0 false true false true 1 false true true true +VDBName 12 parts java.lang.String VDBName string SYS Tables 255 255 0 false true false false 1 true true false false +SchemaName 12 parts java.lang.String SchemaName string SYS Tables 255 255 0 false true false false 1 true true false false Name 12 parts java.lang.String Name string SYS Tables 255 255 0 false true false false 0 true true false false -Type 12 parts java.lang.String Type string SYS Tables 20 20 0 false false false false 0 true true false false +Type 12 parts java.lang.String Type string SYS Tables 20 20 0 false true false false 0 true true false false NameInSource 12 parts java.lang.String NameInSource string SYS Tables 255 255 0 false true false false 1 true true false false -IsPhysical -7 parts java.lang.Boolean IsPhysical boolean SYS Tables 5 1 0 false true false false 0 true true false false +IsPhysical -7 parts java.lang.Boolean IsPhysical boolean SYS Tables 5 1 0 false false false false 0 true true false false SupportsUpdates -7 parts java.lang.Boolean SupportsUpdates boolean SYS Tables 5 1 0 false false false false 0 true true false false -UID 12 parts java.lang.String UID string SYS Tables 50 50 0 false false false false 0 true true false false -Cardinality 4 parts java.lang.Integer Cardinality integer SYS Tables 11 10 0 false true false false 0 true true true false -Description 12 parts java.lang.String Description string SYS Tables 255 255 0 false true false true 1 false true true true -IsSystem -7 parts java.lang.Boolean IsSystem boolean SYS Tables 5 1 0 false true false true 1 false true true true -IsMaterialized -7 parts java.lang.Boolean IsMaterialized boolean SYS Tables 5 1 0 false false false true 0 false true false true -OID 4 parts java.lang.Integer OID integer SYS Tables 11 10 0 false false false false 0 true true false false +UID 12 parts java.lang.String UID string SYS Tables 50 50 0 false true false false 0 true true false false +Cardinality 4 parts java.lang.Integer Cardinality integer SYS Tables 11 10 0 false false false false 0 true true true false +Description 12 parts java.lang.String Description string SYS Tables 255 255 0 false true false false 1 true true false false +IsSystem -7 parts java.lang.Boolean IsSystem boolean SYS Tables 5 1 0 false false false false 1 true true false false +IsMaterialized -7 parts java.lang.Boolean IsMaterialized boolean SYS Tables 5 1 0 false false false false 0 true true false false +OID 4 parts java.lang.Integer OID integer SYS Tables 11 10 0 false false false false 0 true true true false Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected 2012-07-19 15:47:33 UTC (rev 4245) @@ -158,56 +158,56 @@ QT_Ora9DS VQT Base.Order3 E 12 string 4000 <null> 0 10 0 <null> <null> <null> <null> 20 1 NO <null> <null> <null> ! <null> NO QT_Ora9DS VQT Base.Order4 StringNum 12 string 4000 <null> 0 10 1 <null> <null> <null> <null> 10 1 YES <null> <null> <null> ! <null> NO QT_Ora9DS VQT Base.Order5 StringNum 12 string 4000 <null> 0 10 1 <null> <null> <null> <null> 10 1 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns VDBName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns SchemaName 12 string 4000 <null> 0 10 1 <null> <null> <null> <null> 255 2 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns TableName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 3 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 4 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns Position 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 5 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns NameInSource 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 6 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns DataType 12 string 100 <null> 0 10 0 <null> <null> <null> <null> 100 7 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns Scale 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 8 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns Length 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 9 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns IsLengthFixed -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 10 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns SupportsSelect -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 11 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns SupportsUpdates -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 12 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns IsCaseSensitive -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 13 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns IsSigned -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 14 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns IsCurrency -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 15 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns IsAutoIncremented -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 16 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns NullType 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 17 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns MinRange 12 string 50 <null> 0 10 1 <null> <null> <null> <null> 50 18 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns MaxRange 12 string 50 <null> 0 10 1 <null> <null> <null> <null> 50 19 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns DistinctCount 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 20 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns NullCount 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 21 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns SearchType 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 22 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns Format 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 23 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns DefaultValue 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 24 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns JavaClass 12 string 500 <null> 0 10 0 <null> <null> <null> <null> 500 25 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns Precision 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 26 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns CharOctetLength 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 27 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns Radix 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 28 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 29 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 30 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Columns OID 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 31 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS DataTypes Name 12 string 100 <null> 0 10 0 <null> <null> <null> <null> 100 1 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS DataTypes IsStandard -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 1 2 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS DataTypes IsPhysical -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 1 3 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS DataTypes TypeName 12 string 100 <null> 0 10 0 <null> <null> <null> <null> 100 4 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS DataTypes JavaClass 12 string 500 <null> 0 10 0 <null> <null> <null> <null> 500 5 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS DataTypes Scale 4 integer 10 <null> 0 10 1 <null> (0) <null> <null> 10 6 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS DataTypes TypeLength 4 integer 10 <null> 0 10 0 <null> (0) <null> <null> 10 7 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS DataTypes NullType 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 8 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS DataTypes IsSigned -7 boolean 1 <null> 0 10 0 <null> ('0') <null> <null> 1 9 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS DataTypes IsAutoIncremented -7 boolean 1 <null> 0 10 0 <null> ('0') <null> <null> 1 10 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS DataTypes IsCaseSensitive -7 boolean 1 <null> 0 10 0 <null> ('0') <null> <null> 1 11 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS DataTypes Precision 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 12 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS DataTypes Radix 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 13 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS DataTypes SearchType 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 14 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS DataTypes UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 15 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS DataTypes RuntimeType 12 string 64 <null> 0 10 1 <null> <null> <null> <null> 64 16 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS DataTypes BaseType 12 string 64 <null> 0 10 1 <null> <null> <null> <null> 64 17 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS DataTypes Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 18 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS DataTypes OID 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 19 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns VDBName 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 1 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns SchemaName 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 2 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns TableName 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 3 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns Name 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 4 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns Position 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 5 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns NameInSource 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 6 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns DataType 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 7 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns Scale 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 8 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns Length 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 9 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns IsLengthFixed -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 0 10 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns SupportsSelect -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 0 11 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns SupportsUpdates -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 0 12 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns IsCaseSensitive -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 0 13 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns IsSigned -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 0 14 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns IsCurrency -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 0 15 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns IsAutoIncremented -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 0 16 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns NullType 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 17 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns MinRange 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 18 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns MaxRange 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 19 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns DistinctCount 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 20 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns NullCount 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 21 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns SearchType 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 22 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns Format 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 23 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns DefaultValue 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 24 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns JavaClass 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 25 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns Precision 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 26 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns CharOctetLength 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 27 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns Radix 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 28 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns UID 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 29 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns Description 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 30 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Columns OID 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 31 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes Name 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 1 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes IsStandard -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 0 2 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes IsPhysical -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 0 3 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes TypeName 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 4 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes JavaClass 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 5 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes Scale 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 6 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes TypeLength 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 7 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes NullType 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 8 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes IsSigned -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 0 9 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes IsAutoIncremented -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 0 10 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes IsCaseSensitive -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 0 11 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes Precision 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 12 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes Radix 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 13 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes SearchType 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 14 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes UID 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 15 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes RuntimeType 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 16 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes BaseType 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 17 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes Description 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 18 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS DataTypes OID 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 19 NO <null> <null> <null> ! <null> NO QT_Ora9DS BQT1 HugeA IntKey 4 integer 22 <null> 0 10 0 <null> <null> <null> <null> 0 1 NO <null> <null> <null> ! <null> NO QT_Ora9DS BQT2 HugeA IntKey 4 integer 22 <null> 0 10 0 <null> <null> <null> <null> 0 1 NO <null> <null> <null> ! <null> NO QT_Ora9DS BQT1 HugeA StringKey 12 string 4000 <null> 0 10 0 <null> <null> <null> <null> 10 2 NO <null> <null> <null> ! <null> NO @@ -276,27 +276,27 @@ QT_Ora9DS BQT2 HugeB BigDecimalValue 2 bigdecimal 20 <null> 0 10 1 <null> <null> <null> <null> 126 16 YES <null> <null> <null> ! <null> NO QT_Ora9DS BQT1 HugeB ObjectValue 2000 object 2048 <null> 0 10 1 <null> <null> <null> <null> 2048 17 YES <null> <null> <null> ! <null> NO QT_Ora9DS BQT2 HugeB ObjectValue 2000 object 2048 <null> 0 10 1 <null> <null> <null> <null> 2048 17 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS KeyColumns VDBName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS KeyColumns SchemaName 12 string 4000 <null> 0 10 1 <null> <null> <null> <null> 255 2 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS KeyColumns TableName 12 string 2048 <null> 0 10 0 <null> <null> <null> <null> 2048 3 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS KeyColumns Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 4 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS KeyColumns KeyName 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 5 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS KeyColumns KeyType 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 6 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS KeyColumns RefKeyUID 12 string 50 <null> 0 10 1 <null> <null> <null> <null> 50 7 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS KeyColumns UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 8 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS KeyColumns Position 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 9 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS KeyColumns OID 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 10 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Keys VDBName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Keys SchemaName 12 string 4000 <null> 0 10 1 <null> <null> <null> <null> 255 2 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Keys TableName 12 string 2048 <null> 0 10 0 <null> <null> <null> <null> 2048 3 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Keys Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 4 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Keys Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 5 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Keys NameInSource 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 6 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Keys Type 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 7 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Keys IsIndexed -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 8 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Keys RefKeyUID 12 string 50 <null> 0 10 1 <null> <null> <null> <null> 50 9 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Keys UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 10 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Keys OID 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 11 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS KeyColumns VDBName 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 1 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS KeyColumns SchemaName 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 2 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS KeyColumns TableName 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 3 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS KeyColumns Name 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 4 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS KeyColumns KeyName 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 5 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS KeyColumns KeyType 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 6 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS KeyColumns RefKeyUID 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 7 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS KeyColumns UID 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 8 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS KeyColumns Position 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 9 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS KeyColumns OID 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 10 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Keys VDBName 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 1 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Keys SchemaName 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 2 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Keys TableName 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 3 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Keys Name 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 4 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Keys Description 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 5 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Keys NameInSource 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 6 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Keys Type 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 7 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Keys IsIndexed -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 0 8 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Keys RefKeyUID 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 9 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Keys UID 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 10 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Keys OID 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 11 NO <null> <null> <null> ! <null> NO QT_Ora9DS BQT1 LargeA IntKey 4 integer 22 <null> 0 10 0 <null> <null> <null> <null> 0 1 NO <null> <null> <null> ! <null> NO QT_Ora9DS BQT2 LargeA IntKey 4 integer 22 <null> 0 10 0 <null> <null> <null> <null> 0 1 NO <null> <null> <null> ! <null> NO QT_Ora9DS BQT1 LargeA StringKey 12 string 4000 <null> 0 10 0 <null> <null> <null> <null> 10 2 NO <null> <null> <null> ! <null> NO @@ -365,15 +365,15 @@ QT_Ora9DS BQT2 LargeB BigDecimalValue 2 bigdecimal 20 <null> 0 10 1 <null> <null> <null> <null> 126 16 YES <null> <null> <null> ! <null> NO QT_Ora9DS BQT1 LargeB ObjectValue 2000 object 2048 <null> 0 10 1 <null> <null> <null> <null> 2048 17 YES <null> <null> <null> ! <null> NO QT_Ora9DS BQT2 LargeB ObjectValue 2000 object 2048 <null> 0 10 1 <null> <null> <null> <null> 2048 17 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYSADMIN MatViews VDBName 12 string 4000 <null> 0 10 0 <null> <null> <null> <null> 255 1 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYSADMIN MatViews SchemaName 12 string 4000 <null> 0 10 0 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYSADMIN MatViews Name 12 string 4000 <null> 0 10 0 <null> <null> <null> <null> 255 3 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYSADMIN MatViews TargetSchemaName 12 string 4000 <null> 0 10 1 <null> <null> <null> <null> 255 4 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYSADMIN MatViews TargetName 12 string 4000 <null> 0 10 1 <null> <null> <null> <null> 4000 5 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYSADMIN MatViews VDBName 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 1 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYSADMIN MatViews SchemaName 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 2 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYSADMIN MatViews Name 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 3 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYSADMIN MatViews TargetSchemaName 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 4 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYSADMIN MatViews TargetName 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 5 YES <null> <null> <null> ! <null> NO QT_Ora9DS SYSADMIN MatViews Valid -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 0 6 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYSADMIN MatViews LoadState 12 string 4000 <null> 0 10 1 <null> <null> <null> <null> 255 7 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYSADMIN MatViews Updated 93 timestamp 29 <null> 0 10 1 <null> <null> <null> <null> 0 8 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYSADMIN MatViews Cardinality 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 9 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYSADMIN MatViews LoadState 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 7 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYSADMIN MatViews Updated 93 timestamp 12 <null> 0 0 1 <null> <null> <null> <null> 0 8 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYSADMIN MatViews Cardinality 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 9 YES <null> <null> <null> ! <null> NO QT_Ora9DS BQT1 MediumA IntKey 4 integer 22 <null> 0 10 0 <null> <null> <null> <null> 0 1 NO <null> <null> <null> ! <null> NO QT_Ora9DS BQT2 MediumA IntKey 4 integer 22 <null> 0 10 0 <null> <null> <null> <null> 0 1 NO <null> <null> <null> ! <null> NO QT_Ora9DS BQT1 MediumA StringKey 12 string 4000 <null> 0 10 0 <null> <null> <null> <null> 10 2 NO <null> <null> <null> ! <null> NO @@ -442,56 +442,56 @@ QT_Ora9DS BQT2 MediumB BigDecimalValue 2 bigdecimal 20 <null> 0 10 1 <null> <null> <null> <null> 126 16 YES <null> <null> <null> ! <null> NO QT_Ora9DS BQT1 MediumB ObjectValue 2000 object 2048 <null> 0 10 1 <null> <null> <null> <null> 2048 17 YES <null> <null> <null> ! <null> NO QT_Ora9DS BQT2 MediumB ObjectValue 2000 object 2048 <null> 0 10 1 <null> <null> <null> <null> 2048 17 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ProcedureParams VDBName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ProcedureParams SchemaName 12 string 4000 <null> 0 10 1 <null> <null> <null> <null> 255 2 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ProcedureParams ProcedureName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 3 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ProcedureParams Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 4 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ProcedureParams DataType 12 string 25 <null> 0 10 0 <null> <null> <null> <null> 25 5 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ProcedureParams Position 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 6 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ProcedureParams Type 12 string 100 <null> 0 10 0 <null> <null> <null> <null> 100 7 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ProcedureParams Optional -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 8 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ProcedureParams Precision 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 9 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ProcedureParams TypeLength 4 integer 10 <null> 0 10 0 <null> (0) <null> <null> 10 10 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ProcedureParams Scale 4 integer 10 <null> 0 10 0 <null> (0) <null> <null> 10 11 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ProcedureParams Radix 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 12 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ProcedureParams NullType 12 string 10 <null> 0 10 0 <null> <null> <null> <null> 10 13 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ProcedureParams UID 12 string 4000 <null> 0 10 1 <null> <null> <null> <null> 50 14 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ProcedureParams Description 12 string 4000 <null> 0 10 1 <null> <null> <null> <null> 255 15 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ProcedureParams OID 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 16 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Procedures VDBName 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Procedures SchemaName 12 string 4000 <null> 0 10 1 <null> <null> <null> <null> 255 2 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Procedures Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 3 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Procedures NameInSource 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 4 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Procedures ReturnsResults -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 5 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Procedures UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 6 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Procedures Description 12 string 225 <null> 0 10 1 <null> <null> <null> <null> 255 7 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Procedures OID 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 8 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Properties Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Properties Value 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 2 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Properties UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 3 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Properties OID 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 4 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Properties ClobValue 2005 clob 2097152 <null> 0 10 1 <null> <null> <null> <null> 2097152 5 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ReferenceKeyColumns PKTABLE_CAT 12 string 1 <null> 0 10 1 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ReferenceKeyColumns PKTABLE_SCHEM 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 2 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ReferenceKeyColumns PKTABLE_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 3 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ReferenceKeyColumns PKCOLUMN_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 4 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ReferenceKeyColumns FKTABLE_CAT 12 string 1 <null> 0 10 1 <null> <null> <null> <null> 255 5 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ReferenceKeyColumns FKTABLE_SCHEM 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 6 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ReferenceKeyColumns FKTABLE_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 7 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ReferenceKeyColumns FKCOLUMN_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 8 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ReferenceKeyColumns KEY_SEQ 5 short 5 <null> 0 10 1 <null> <null> <null> <null> 5 9 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ReferenceKeyColumns UPDATE_RULE 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 10 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ReferenceKeyColumns DELETE_RULE 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 11 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ReferenceKeyColumns FK_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 12 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ReferenceKeyColumns PK_NAME 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 13 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS ReferenceKeyColumns DEFERRABILITY 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 10 14 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Schemas VDBName 12 string 4000 <null> 0 10 1 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Schemas Name 12 string 4000 <null> 0 10 1 <null> <null> <null> <null> 255 2 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Schemas IsPhysical -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 3 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Schemas UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 4 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Schemas Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 5 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Schemas PrimaryMetamodelURI 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 6 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Schemas OID 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 7 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams VDBName 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 1 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams SchemaName 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 2 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams ProcedureName 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 3 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams Name 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 4 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams DataType 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 5 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams Position 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 6 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams Type 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 7 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams Optional -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 0 8 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams Precision 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 9 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams TypeLength 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 10 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams Scale 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 11 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams Radix 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 12 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams NullType 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 13 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams UID 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 14 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams Description 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 15 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ProcedureParams OID 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 16 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Procedures VDBName 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 1 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Procedures SchemaName 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 2 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Procedures Name 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 3 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Procedures NameInSource 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 4 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Procedures ReturnsResults -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 0 5 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Procedures UID 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 6 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Procedures Description 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 7 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Procedures OID 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 8 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Properties Name 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 1 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Properties Value 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 2 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Properties UID 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 3 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Properties OID 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 4 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Properties ClobValue 2005 clob 2097152 <null> 0 0 1 <null> <null> <null> <null> 0 5 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns PKTABLE_CAT 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 1 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns PKTABLE_SCHEM 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 2 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns PKTABLE_NAME 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 3 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns PKCOLUMN_NAME 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 4 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns FKTABLE_CAT 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 5 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns FKTABLE_SCHEM 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 6 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns FKTABLE_NAME 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 7 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns FKCOLUMN_NAME 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 8 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns KEY_SEQ 5 short 5 <null> 0 10 1 <null> <null> <null> <null> 0 9 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns UPDATE_RULE 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 10 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns DELETE_RULE 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 11 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns FK_NAME 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 12 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns PK_NAME 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 13 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS ReferenceKeyColumns DEFERRABILITY 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 14 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Schemas VDBName 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 1 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Schemas Name 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 2 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Schemas IsPhysical -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 0 3 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Schemas UID 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 4 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Schemas Description 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 5 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Schemas PrimaryMetamodelURI 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 6 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Schemas OID 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 7 NO <null> <null> <null> ! <null> NO QT_Ora9DS BQT1 SmallA IntKey 4 integer 22 <null> 0 10 0 <null> <null> <null> <null> 0 1 NO <null> <null> <null> ! <null> NO QT_Ora9DS BQT2 SmallA IntKey 4 integer 22 <null> 0 10 0 <null> <null> <null> <null> 0 1 NO <null> <null> <null> ! <null> NO QT_Ora9DS BQT1 SmallA StringKey 12 string 4000 <null> 0 10 0 <null> <null> <null> <null> 10 2 NO <null> <null> <null> ! <null> NO @@ -560,19 +560,19 @@ QT_Ora9DS BQT2 SmallB BigDecimalValue 2 bigdecimal 20 <null> 0 10 1 <null> <null> <null> <null> 126 16 YES <null> <null> <null> ! <null> NO QT_Ora9DS BQT1 SmallB ObjectValue 2000 object 2048 <null> 0 10 1 <null> <null> <null> <null> 2048 17 YES <null> <null> <null> ! <null> NO QT_Ora9DS BQT2 SmallB ObjectValue 2000 object 2048 <null> 0 10 1 <null> <null> <null> <null> 2048 17 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Tables VDBName 12 string 4000 <null> 0 10 1 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Tables SchemaName 12 string 4000 <null> 0 10 1 <null> <null> <null> <null> 255 2 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Tables Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 3 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Tables Type 12 string 20 <null> 0 10 0 <null> <null> <null> <null> 20 4 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Tables NameInSource 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 5 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Tables IsPhysical -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 6 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Tables SupportsUpdates -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 1 7 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Tables UID 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 8 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Tables Cardinality 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 9 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Tables Description 12 string 255 <null> 0 10 1 <null> <null> <null> <null> 255 10 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Tables IsSystem -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 1 11 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables VDBName 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 1 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables SchemaName 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 2 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables Name 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 3 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables Type 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 4 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables NameInSource 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 5 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables IsPhysical -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 0 6 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables SupportsUpdates -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 0 7 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables UID 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 8 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables Cardinality 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 9 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables Description 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 10 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables IsSystem -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 0 11 YES <null> <null> <null> ! <null> NO QT_Ora9DS SYS Tables IsMaterialized -7 boolean 1 <null> 0 10 0 <null> <null> <null> <null> 0 12 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS Tables OID 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 10 13 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS Tables OID 4 integer 10 <null> 0 10 0 <null> <null> <null> <null> 0 13 NO <null> <null> <null> ! <null> NO QT_Ora9DS VQT Union.U1 IntKey 4 integer 22 <null> 0 10 0 <null> <null> <null> <null> 0 1 NO <null> <null> <null> ! <null> NO QT_Ora9DS VQT Union.U1 StringKey 12 string 4000 <null> 0 10 0 <null> <null> <null> <null> 10 2 NO <null> <null> <null> ! <null> NO QT_Ora9DS VQT Union.U1 IntNum 4 integer 22 <null> 0 10 1 <null> <null> <null> <null> 0 3 YES <null> <null> <null> ! <null> NO @@ -688,10 +688,10 @@ QT_Ora9DS VQT Union.U9 A 4 integer 22 <null> 0 10 0 <null> <null> <null> <null> 0 1 NO <null> <null> <null> ! <null> NO QT_Ora9DS VQT Union.U9 B 12 string 4000 <null> 0 10 0 <null> <null> <null> <null> 10 2 NO <null> <null> <null> ! <null> NO QT_Ora9DS VQT Union.U9 C 7 float 20 <null> 0 10 0 <null> <null> <null> <null> 126 3 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYSADMIN VDBResources resourcePath 12 string 4000 <null> 0 10 1 <null> <null> <null> <null> 255 1 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYSADMIN VDBResources contents 2004 blob 2147483647 <null> 0 10 1 <null> <null> <null> <null> 0 2 YES <null> <null> <null> ! <null> NO -QT_Ora9DS SYS VirtualDatabases Name 12 string 255 <null> 0 10 0 <null> <null> <null> <null> 255 1 NO <null> <null> <null> ! <null> NO -QT_Ora9DS SYS VirtualDatabases Version 12 string 50 <null> 0 10 0 <null> <null> <null> <null> 50 2 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYSADMIN VDBResources resourcePath 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 1 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYSADMIN VDBResources contents 2004 blob 2147483647 <null> 0 0 1 <null> <null> <null> <null> 0 2 YES <null> <null> <null> ! <null> NO +QT_Ora9DS SYS VirtualDatabases Name 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 1 NO <null> <null> <null> ! <null> NO +QT_Ora9DS SYS VirtualDatabases Version 12 string 4000 <null> 0 0 0 <null> <null> <null> <null> 0 2 NO <null> <null> <null> ! <null> NO QT_Ora9DS XQTDoc choiceTestDocument choiceTest.data1.wrapper1.data1 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 0 YES <null> <null> <null> ! <null> NO QT_Ora9DS XQTDoc choiceTestDocument choiceTest.data1.wrapper1.key1 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 0 YES <null> <null> <null> ! <null> NO QT_Ora9DS XQTDoc choiceTestDocument choiceTest.data1.wrapper1 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 0 YES <null> <null> <null> ! <null> NO @@ -1088,23 +1088,23 @@ QT_Ora9DS XQT xqtFullData ObjectValue 2000 object 2048 <null> 0 10 1 <null> <null> <null> <null> 2048 17 YES <null> <null> <null> ! <null> NO Row Count : 1086 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -VDBName 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Columns 255 255 0 false false false false 0 true true false false -SchemaName 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false true 1 false true true true +VDBName 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Columns 255 255 0 false true false false 0 true true false false +SchemaName 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false false 1 true true false false TableName 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS Columns 255 255 0 false true false false 0 true true false false -Name 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS Columns 255 255 0 false false false false 0 true true false false -Length 4 QT_Ora9DS java.lang.Integer DATA_TYPE integer SYS Columns 11 10 0 false false false false 0 true true false false -DataType 12 QT_Ora9DS java.lang.String TYPE_NAME string SYS Columns 100 100 0 false true false false 0 true true true false -Precision 4 QT_Ora9DS java.lang.Integer COLUMN_SIZE integer SYS Columns 11 10 0 false false false false 0 true true false false +Name 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS Columns 255 255 0 false true false false 0 true true false false +Length 4 QT_Ora9DS java.lang.Integer DATA_TYPE integer SYS Columns 11 10 0 false false false false 0 true true true false +DataType 12 QT_Ora9DS java.lang.String TYPE_NAME string SYS Columns 100 100 0 false true false false 0 true true false false +Precision 4 QT_Ora9DS java.lang.Integer COLUMN_SIZE integer SYS Columns 11 10 0 false false false false 0 true true true false BUFFER_LENGTH 12 QT_Ora9DS java.lang.String BUFFER_LENGTH string <null> <null> 4000 4000 0 false false false true 1 false true true true -Scale 4 QT_Ora9DS java.lang.Integer DECIMAL_DIGITS integer SYS Columns 11 10 0 false false false false 0 true true false false -Radix 4 QT_Ora9DS java.lang.Integer NUM_PREC_RADIX integer SYS Columns 11 10 0 false false false false 0 true true false false +Scale 4 QT_Ora9DS java.lang.Integer DECIMAL_DIGITS integer SYS Columns 11 10 0 false false false false 0 true true true false +Radix 4 QT_Ora9DS java.lang.Integer NUM_PREC_RADIX integer SYS Columns 11 10 0 false false false false 0 true true true false NULLABLE 4 QT_Ora9DS java.lang.Integer NULLABLE integer <null> <null> 11 10 0 false false false true 1 false true true true -Description 12 QT_Ora9DS java.lang.String REMARKS string SYS Columns 255 255 0 false true false true 1 false true true true -DefaultValue 12 QT_Ora9DS java.lang.String COLUMN_DEF string SYS Columns 255 255 0 false false false false 1 true true false false +Description 12 QT_Ora9DS java.lang.String REMARKS string SYS Columns 255 255 0 false true false false 1 true true false false +DefaultValue 12 QT_Ora9DS java.lang.String COLUMN_DEF string SYS Columns 255 255 0 false true false false 1 true true false false SQL_DATA_TYPE 12 QT_Ora9DS java.lang.String SQL_DATA_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true SQL_DATETIME_SUB 12 QT_Ora9DS java.lang.String SQL_DATETIME_SUB string <null> <null> 4000 4000 0 false false false true 1 false true true true -CharOctetLength 4 QT_Ora9DS java.lang.Integer CHAR_OCTET_LENGTH integer SYS Columns 11 10 0 false false false false 1 true true false false -Position 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer SYS Columns 11 10 0 false false false false 0 true true false false +CharOctetLength 4 QT_Ora9DS java.lang.Integer CHAR_OCTET_LENGTH integer SYS Columns 11 10 0 false false false false 1 true true true false +Position 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer SYS Columns 11 10 0 false false false false 0 true true true false IS_NULLABLE 12 QT_Ora9DS java.lang.String IS_NULLABLE string <null> <null> 4000 4000 0 false false false true 1 false true true true SCOPE_CATALOG 12 QT_Ora9DS java.lang.String SCOPE_CATALOG string <null> <null> 4000 4000 0 false false false true 1 false true true true SCOPE_SCHEMA 12 QT_Ora9DS java.lang.String SCOPE_SCHEMA string <null> <null> 4000 4000 0 false false false true 1 false true true true Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns2.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns2.expected 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns2.expected 2012-07-19 15:47:33 UTC (rev 4245) @@ -2,23 +2,23 @@ TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME DATA_TYPE TYPE_NAME COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS NUM_PREC_RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION IS_NULLABLE SCOPE_CATALOG SCOPE_SCHEMA SCOPE_TAB! LE SOURCE_DATA_TYPE IS_AUTOINCREMENT Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -VDBName 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Columns 255 255 0 false false false false 0 true true false false -SchemaName 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false true 1 false true true true +VDBName 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Columns 255 255 0 false true false false 0 true true false false +SchemaName 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false false 1 true true false false TableName 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS Columns 255 255 0 false true false false 0 true true false false -Name 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS Columns 255 255 0 false false false false 0 true true false false -Length 4 QT_Ora9DS java.lang.Integer DATA_TYPE integer SYS Columns 11 10 0 false false false false 0 true true false false -DataType 12 QT_Ora9DS java.lang.String TYPE_NAME string SYS Columns 100 100 0 false true false false 0 true true true false -Precision 4 QT_Ora9DS java.lang.Integer COLUMN_SIZE integer SYS Columns 11 10 0 false false false false 0 true true false false +Name 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS Columns 255 255 0 false true false false 0 true true false false +Length 4 QT_Ora9DS java.lang.Integer DATA_TYPE integer SYS Columns 11 10 0 false false false false 0 true true true false +DataType 12 QT_Ora9DS java.lang.String TYPE_NAME string SYS Columns 100 100 0 false true false false 0 true true false false +Precision 4 QT_Ora9DS java.lang.Integer COLUMN_SIZE integer SYS Columns 11 10 0 false false false false 0 true true true false BUFFER_LENGTH 12 QT_Ora9DS java.lang.String BUFFER_LENGTH string <null> <null> 4000 4000 0 false false false true 1 false true true true -Scale 4 QT_Ora9DS java.lang.Integer DECIMAL_DIGITS integer SYS Columns 11 10 0 false false false false 0 true true false false -Radix 4 QT_Ora9DS java.lang.Integer NUM_PREC_RADIX integer SYS Columns 11 10 0 false false false false 0 true true false false +Scale 4 QT_Ora9DS java.lang.Integer DECIMAL_DIGITS integer SYS Columns 11 10 0 false false false false 0 true true true false +Radix 4 QT_Ora9DS java.lang.Integer NUM_PREC_RADIX integer SYS Columns 11 10 0 false false false false 0 true true true false NULLABLE 4 QT_Ora9DS java.lang.Integer NULLABLE integer <null> <null> 11 10 0 false false false true 1 false true true true -Description 12 QT_Ora9DS java.lang.String REMARKS string SYS Columns 255 255 0 false true false true 1 false true true true -DefaultValue 12 QT_Ora9DS java.lang.String COLUMN_DEF string SYS Columns 255 255 0 false false false false 1 true true false false +Description 12 QT_Ora9DS java.lang.String REMARKS string SYS Columns 255 255 0 false true false false 1 true true false false +DefaultValue 12 QT_Ora9DS java.lang.String COLUMN_DEF string SYS Columns 255 255 0 false true false false 1 true true false false SQL_DATA_TYPE 12 QT_Ora9DS java.lang.String SQL_DATA_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true SQL_DATETIME_SUB 12 QT_Ora9DS java.lang.String SQL_DATETIME_SUB string <null> <null> 4000 4000 0 false false false true 1 false true true true -CharOctetLength 4 QT_Ora9DS java.lang.Integer CHAR_OCTET_LENGTH integer SYS Columns 11 10 0 false false false false 1 true true false false -Position 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer SYS Columns 11 10 0 false false false false 0 true true false false +CharOctetLength 4 QT_Ora9DS java.lang.Integer CHAR_OCTET_LENGTH integer SYS Columns 11 10 0 false false false false 1 true true true false +Position 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer SYS Columns 11 10 0 false false false false 0 true true true false IS_NULLABLE 12 QT_Ora9DS java.lang.String IS_NULLABLE string <null> <null> 4000 4000 0 false false false true 1 false true true true SCOPE_CATALOG 12 QT_Ora9DS java.lang.String SCOPE_CATALOG string <null> <null> 4000 4000 0 false false false true 1 false true true true SCOPE_SCHEMA 12 QT_Ora9DS java.lang.String SCOPE_SCHEMA string <null> <null> 4000 4000 0 false false false true 1 false true true true Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns3.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns3.expected 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns3.expected 2012-07-19 15:47:33 UTC (rev 4245) @@ -2,23 +2,23 @@ TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME DATA_TYPE TYPE_NAME COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS NUM_PREC_RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION IS_NULLABLE SCOPE_CATALOG SCOPE_SCHEMA SCOPE_TAB! LE SOURCE_DATA_TYPE IS_AUTOINCREMENT Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -VDBName 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Columns 255 255 0 false false false false 0 true true false false -SchemaName 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false true 1 false true true true +VDBName 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Columns 255 255 0 false true false false 0 true true false false +SchemaName 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false false 1 true true false false TableName 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS Columns 255 255 0 false true false false 0 true true false false -Name 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS Columns 255 255 0 false false false false 0 true true false false -Length 4 QT_Ora9DS java.lang.Integer DATA_TYPE integer SYS Columns 11 10 0 false false false false 0 true true false false -DataType 12 QT_Ora9DS java.lang.String TYPE_NAME string SYS Columns 100 100 0 false true false false 0 true true true false -Precision 4 QT_Ora9DS java.lang.Integer COLUMN_SIZE integer SYS Columns 11 10 0 false false false false 0 true true false false +Name 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS Columns 255 255 0 false true false false 0 true true false false +Length 4 QT_Ora9DS java.lang.Integer DATA_TYPE integer SYS Columns 11 10 0 false false false false 0 true true true false +DataType 12 QT_Ora9DS java.lang.String TYPE_NAME string SYS Columns 100 100 0 false true false false 0 true true false false +Precision 4 QT_Ora9DS java.lang.Integer COLUMN_SIZE integer SYS Columns 11 10 0 false false false false 0 true true true false BUFFER_LENGTH 12 QT_Ora9DS java.lang.String BUFFER_LENGTH string <null> <null> 4000 4000 0 false false false true 1 false true true true -Scale 4 QT_Ora9DS java.lang.Integer DECIMAL_DIGITS integer SYS Columns 11 10 0 false false false false 0 true true false false -Radix 4 QT_Ora9DS java.lang.Integer NUM_PREC_RADIX integer SYS Columns 11 10 0 false false false false 0 true true false false +Scale 4 QT_Ora9DS java.lang.Integer DECIMAL_DIGITS integer SYS Columns 11 10 0 false false false false 0 true true true false +Radix 4 QT_Ora9DS java.lang.Integer NUM_PREC_RADIX integer SYS Columns 11 10 0 false false false false 0 true true true false NULLABLE 4 QT_Ora9DS java.lang.Integer NULLABLE integer <null> <null> 11 10 0 false false false true 1 false true true true -Description 12 QT_Ora9DS java.lang.String REMARKS string SYS Columns 255 255 0 false true false true 1 false true true true -DefaultValue 12 QT_Ora9DS java.lang.String COLUMN_DEF string SYS Columns 255 255 0 false false false false 1 true true false false +Description 12 QT_Ora9DS java.lang.String REMARKS string SYS Columns 255 255 0 false true false false 1 true true false false +DefaultValue 12 QT_Ora9DS java.lang.String COLUMN_DEF string SYS Columns 255 255 0 false true false false 1 true true false false SQL_DATA_TYPE 12 QT_Ora9DS java.lang.String SQL_DATA_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true SQL_DATETIME_SUB 12 QT_Ora9DS java.lang.String SQL_DATETIME_SUB string <null> <null> 4000 4000 0 false false false true 1 false true true true -CharOctetLength 4 QT_Ora9DS java.lang.Integer CHAR_OCTET_LENGTH integer SYS Columns 11 10 0 false false false false 1 true true false false -Position 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer SYS Columns 11 10 0 false false false false 0 true true false false +CharOctetLength 4 QT_Ora9DS java.lang.Integer CHAR_OCTET_LENGTH integer SYS Columns 11 10 0 false false false false 1 true true true false +Position 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer SYS Columns 11 10 0 false false false false 0 true true true false IS_NULLABLE 12 QT_Ora9DS java.lang.String IS_NULLABLE string <null> <null> 4000 4000 0 false false false true 1 false true true true SCOPE_CATALOG 12 QT_Ora9DS java.lang.String SCOPE_CATALOG string <null> <null> 4000 4000 0 false false false true 1 false true true true SCOPE_SCHEMA 12 QT_Ora9DS java.lang.String SCOPE_SCHEMA string <null> <null> 4000 4000 0 false false false true 1 false true true true Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns4.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns4.expected 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns4.expected 2012-07-19 15:47:33 UTC (rev 4245) @@ -2,23 +2,23 @@ TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME DATA_TYPE TYPE_NAME COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS NUM_PREC_RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION IS_NULLABLE SCOPE_CATALOG SCOPE_SCHEMA SCOPE_TAB! LE SOURCE_DATA_TYPE IS_AUTOINCREMENT Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -VDBName 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Columns 255 255 0 false false false false 0 true true false false -SchemaName 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false true 1 false true true true +VDBName 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Columns 255 255 0 false true false false 0 true true false false +SchemaName 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false false 1 true true false false TableName 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS Columns 255 255 0 false true false false 0 true true false false -Name 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS Columns 255 255 0 false false false false 0 true true false false -Length 4 QT_Ora9DS java.lang.Integer DATA_TYPE integer SYS Columns 11 10 0 false false false false 0 true true false false -DataType 12 QT_Ora9DS java.lang.String TYPE_NAME string SYS Columns 100 100 0 false true false false 0 true true true false -Precision 4 QT_Ora9DS java.lang.Integer COLUMN_SIZE integer SYS Columns 11 10 0 false false false false 0 true true false false +Name 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS Columns 255 255 0 false true false false 0 true true false false +Length 4 QT_Ora9DS java.lang.Integer DATA_TYPE integer SYS Columns 11 10 0 false false false false 0 true true true false +DataType 12 QT_Ora9DS java.lang.String TYPE_NAME string SYS Columns 100 100 0 false true false false 0 true true false false +Precision 4 QT_Ora9DS java.lang.Integer COLUMN_SIZE integer SYS Columns 11 10 0 false false false false 0 true true true false BUFFER_LENGTH 12 QT_Ora9DS java.lang.String BUFFER_LENGTH string <null> <null> 4000 4000 0 false false false true 1 false true true true -Scale 4 QT_Ora9DS java.lang.Integer DECIMAL_DIGITS integer SYS Columns 11 10 0 false false false false 0 true true false false -Radix 4 QT_Ora9DS java.lang.Integer NUM_PREC_RADIX integer SYS Columns 11 10 0 false false false false 0 true true false false +Scale 4 QT_Ora9DS java.lang.Integer DECIMAL_DIGITS integer SYS Columns 11 10 0 false false false false 0 true true true false +Radix 4 QT_Ora9DS java.lang.Integer NUM_PREC_RADIX integer SYS Columns 11 10 0 false false false false 0 true true true false NULLABLE 4 QT_Ora9DS java.lang.Integer NULLABLE integer <null> <null> 11 10 0 false false false true 1 false true true true -Description 12 QT_Ora9DS java.lang.String REMARKS string SYS Columns 255 255 0 false true false true 1 false true true true -DefaultValue 12 QT_Ora9DS java.lang.String COLUMN_DEF string SYS Columns 255 255 0 false false false false 1 true true false false +Description 12 QT_Ora9DS java.lang.String REMARKS string SYS Columns 255 255 0 false true false false 1 true true false false +DefaultValue 12 QT_Ora9DS java.lang.String COLUMN_DEF string SYS Columns 255 255 0 false true false false 1 true true false false SQL_DATA_TYPE 12 QT_Ora9DS java.lang.String SQL_DATA_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true SQL_DATETIME_SUB 12 QT_Ora9DS java.lang.String SQL_DATETIME_SUB string <null> <null> 4000 4000 0 false false false true 1 false true true true -CharOctetLength 4 QT_Ora9DS java.lang.Integer CHAR_OCTET_LENGTH integer SYS Columns 11 10 0 false false false false 1 true true false false -Position 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer SYS Columns 11 10 0 false false false false 0 true true false false +CharOctetLength 4 QT_Ora9DS java.lang.Integer CHAR_OCTET_LENGTH integer SYS Columns 11 10 0 false false false false 1 true true true false +Position 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer SYS Columns 11 10 0 false false false false 0 true true true false IS_NULLABLE 12 QT_Ora9DS java.lang.String IS_NULLABLE string <null> <null> 4000 4000 0 false false false true 1 false true true true SCOPE_CATALOG 12 QT_Ora9DS java.lang.String SCOPE_CATALOG string <null> <null> 4000 4000 0 false false false true 1 false true true true SCOPE_SCHEMA 12 QT_Ora9DS java.lang.String SCOPE_SCHEMA string <null> <null> 4000 4000 0 false false false true 1 false true true true Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumnsSingleMatch.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumnsSingleMatch.expected 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumnsSingleMatch.expected 2012-07-19 15:47:33 UTC (rev 4245) @@ -2,23 +2,23 @@ TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME DATA_TYPE TYPE_NAME COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS NUM_PREC_RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION IS_NULLABLE SCOPE_CATALOG SCOPE_SCHEMA SCOPE_TAB! LE SOURCE_DATA_TYPE IS_AUTOINCREMENT Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -VDBName 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Columns 255 255 0 false false false false 0 true true false false -SchemaName 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false true 1 false true true true +VDBName 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Columns 255 255 0 false true false false 0 true true false false +SchemaName 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false false 1 true true false false TableName 12 QT_Ora9DS java.lang.String TABLE_NAME string SYS Columns 255 255 0 false true false false 0 true true false false -Name 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS Columns 255 255 0 false false false false 0 true true false false -Length 4 QT_Ora9DS java.lang.Integer DATA_TYPE integer SYS Columns 11 10 0 false false false false 0 true true false false -DataType 12 QT_Ora9DS java.lang.String TYPE_NAME string SYS Columns 100 100 0 false true false false 0 true true true false -Precision 4 QT_Ora9DS java.lang.Integer COLUMN_SIZE integer SYS Columns 11 10 0 false false false false 0 true true false false +Name 12 QT_Ora9DS java.lang.String COLUMN_NAME string SYS Columns 255 255 0 false true false false 0 true true false false +Length 4 QT_Ora9DS java.lang.Integer DATA_TYPE integer SYS Columns 11 10 0 false false false false 0 true true true false +DataType 12 QT_Ora9DS java.lang.String TYPE_NAME string SYS Columns 100 100 0 false true false false 0 true true false false +Precision 4 QT_Ora9DS java.lang.Integer COLUMN_SIZE integer SYS Columns 11 10 0 false false false false 0 true true true false BUFFER_LENGTH 12 QT_Ora9DS java.lang.String BUFFER_LENGTH string <null> <null> 4000 4000 0 false false false true 1 false true true true -Scale 4 QT_Ora9DS java.lang.Integer DECIMAL_DIGITS integer SYS Columns 11 10 0 false false false false 0 true true false false -Radix 4 QT_Ora9DS java.lang.Integer NUM_PREC_RADIX integer SYS Columns 11 10 0 false false false false 0 true true false false +Scale 4 QT_Ora9DS java.lang.Integer DECIMAL_DIGITS integer SYS Columns 11 10 0 false false false false 0 true true true false +Radix 4 QT_Ora9DS java.lang.Integer NUM_PREC_RADIX integer SYS Columns 11 10 0 false false false false 0 true true true false NULLABLE 4 QT_Ora9DS java.lang.Integer NULLABLE integer <null> <null> 11 10 0 false false false true 1 false true true true -Description 12 QT_Ora9DS java.lang.String REMARKS string SYS Columns 255 255 0 false true false true 1 false true true true -DefaultValue 12 QT_Ora9DS java.lang.String COLUMN_DEF string SYS Columns 255 255 0 false false false false 1 true true false false +Description 12 QT_Ora9DS java.lang.String REMARKS string SYS Columns 255 255 0 false true false false 1 true true false false +DefaultValue 12 QT_Ora9DS java.lang.String COLUMN_DEF string SYS Columns 255 255 0 false true false false 1 true true false false SQL_DATA_TYPE 12 QT_Ora9DS java.lang.String SQL_DATA_TYPE string <null> <null> 4000 4000 0 false false false true 1 false true true true SQL_DATETIME_SUB 12 QT_Ora9DS java.lang.String SQL_DATETIME_SUB string <null> <null> 4000 4000 0 false false false true 1 false true true true -CharOctetLength 4 QT_Ora9DS java.lang.Integer CHAR_OCTET_LENGTH integer SYS Columns 11 10 0 false false false false 1 true true false false -Position 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer SYS Columns 11 10 0 false false false false 0 true true false false +CharOctetLength 4 QT_Ora9DS java.lang.Integer CHAR_OCTET_LENGTH integer SYS Columns 11 10 0 false false false false 1 true true true false +Position 4 QT_Ora9DS java.lang.Integer ORDINAL_POSITION integer SYS Columns 11 10 0 false false false false 0 true true true false IS_NULLABLE 12 QT_Ora9DS java.lang.String IS_NULLABLE string <null> <null> 4000 4000 0 false false false true 1 false true true true SCOPE_CATALOG 12 QT_Ora9DS java.lang.String SCOPE_CATALOG string <null> <null> 4000 4000 0 false false false true 1 false true true true SCOPE_SCHEMA 12 QT_Ora9DS java.lang.String SCOPE_SCHEMA string <null> <null> 4000 4000 0 false false false true 1 false true true true Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetCrossReference.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetCrossReference.expected 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetCrossReference.expected 2012-07-19 15:47:33 UTC (rev 4245) @@ -2,53 +2,53 @@ PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetCrossReferenceWithEscape.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetCrossReferenceWithEscape.expected 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetCrossReferenceWithEscape.expected 2012-07-19 15:47:33 UTC (rev 4245) @@ -2,53 +2,53 @@ PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeys.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeys.expected 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeys.expected 2012-07-19 15:47:33 UTC (rev 4245) @@ -2,53 +2,53 @@ PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeysWithEscape.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeysWithEscape.expected 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetExportedKeysWithEscape.expected 2012-07-19 15:47:33 UTC (rev 4245) @@ -2,53 +2,53 @@ PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeys.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeys.expected 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeys.expected 2012-07-19 15:47:33 UTC (rev 4245) @@ -2,53 +2,53 @@ PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeysWithEscape.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeysWithEscape.expected 2012-07-19 12:14:32 UTC (rev 4244) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetImportedKeysWithEscape.expected 2012-07-19 15:47:33 UTC (rev 4245) @@ -2,53 +2,53 @@ PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false +FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false false false false 1 true true true false string string string string string string string string short integer integer string string integer PKTABLE_CAT PKTABLE_SCHEM PKTABLE_NAME PKCOLUMN_NAME FKTABLE_CAT FKTABLE_SCHEM FKTABLE_NAME FKCOLUMN_NAME KEY_SEQ UPDATE_RULE DELETE_RULE FK_NAME PK_NAME DEFERRABILITY Row Count : 0 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false true false true 1 false true true true -UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -DELETE_RULE 4 QT_Ora9DS java.lang.Integer DELETE_RULE integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true -FK_NAME 12 QT_Ora9DS java.lang.String FK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -PK_NAME 12 QT_Ora9DS java.lang.String PK_NAME string SYS ReferenceKeyColumns 255 255 0 false true false true 1 false true true true -DEFERRABILITY 4 QT_Ora9DS java.lang.Integer DEFERRABILITY integer SYS ReferenceKeyColumns 11 10 0 false true false true 1 false true true true +PKTABLE_CAT 12 QT_Ora9DS java.lang.String PKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_SCHEM 12 QT_Ora9DS java.lang.String PKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKTABLE_NAME 12 QT_Ora9DS java.lang.String PKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +PKCOLUMN_NAME 12 QT_Ora9DS java.lang.String PKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_CAT 12 QT_Ora9DS java.lang.String FKTABLE_CAT string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_SCHEM 12 QT_Ora9DS java.lang.String FKTABLE_SCHEM string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKTABLE_NAME 12 QT_Ora9DS java.lang.String FKTABLE_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +FKCOLUMN_NAME 12 QT_Ora9DS java.lang.String FKCOLUMN_NAME string SYS ReferenceKeyColumns 255 255 0 false true false false 1 true true false false +KEY_SEQ 5 QT_Ora9DS java.lang.Short KEY_SEQ short SYS ReferenceKeyColumns 6 5 0 false false false false 1 true true true false +UPDATE_RULE 4 QT_Ora9DS java.lang.Integer UPDATE_RULE integer SYS ReferenceKeyColumns 11 10 0

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

teiid-commits July 2012