[teiid-commits] teiid SVN: r1751 - in trunk/test-integration/db/src/main/resources/ctc_tests: queries and 4 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Tue Jan 19 14:43:23 EST 2010
Author: vhalbert at redhat.com
Date: 2010-01-19 14:43:23 -0500 (Tue, 19 Jan 2010)
New Revision: 1751
Added:
trunk/test-integration/db/src/main/resources/ctc_tests/ctc-test.properties
trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery1.txt
trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery2.txt
trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery3.txt
trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery4.txt
trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery5.txt
trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery6.txt
trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery7.txt
trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery8.txt
trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery1.txt
trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery2.txt
trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery3.txt
trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery4.txt
trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery5.txt
trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery6.txt
trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery7.txt
trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery8.txt
trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/TestPhysicalQueries.xml
trunk/test-integration/db/src/main/resources/ctc_tests/scenarios/client_test_txnoff.properties
trunk/test-integration/db/src/main/resources/ctc_tests/scenarios/client_test_txnon.properties
trunk/test-integration/db/src/main/resources/ctc_tests/scenarios/scenario.properties.template
Removed:
trunk/test-integration/db/src/main/resources/ctc_tests/queries/test_queries/
Modified:
trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml
Log:
Teiid-773 - adding scripts to suport running cllient test in the db project
Added: trunk/test-integration/db/src/main/resources/ctc_tests/ctc-test.properties
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/ctc-test.properties (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/ctc-test.properties 2010-01-19 19:43:23 UTC (rev 1751)
@@ -0,0 +1,112 @@
+# The ctc-test.properties is used by the bulk client testing .
+# This file provides properties to the process in 2 ways:
+# 1. It acts as a template when property substitution is involved. Meaning the property value will be derived
+# at execution time.
+# 2. The other properties will be static.
+
+
+##--- The following properties are expected to come from the scenario file
+# - ${queryset.dir} indicate which queryset of files to use (because each scenario could be different, bqt, sp, etc)
+# - ${test.queries.dir} indicates which directory in the ${queryset.dir} to find the queries to run.
+# - ${expected.results.dir} indicates which directory in the ${queryset.dir} to find the expected results. This may be different when
+# multiple scenarios use the same queries but have different expected results
+
+
+##--- The following properties are expected to be passed in as system properties
+# - ${queryset.artifacts.dir} indicates where all query sets can be found
+# - ${vdb.artifacts.dir} indicates where the vdbs can be found
+
+
+# the location where a specific query set can be found
+queryfiles.loc=${queryset.artifacts.dir}/${queryset.dir}/${test.queries.dir}
+
+# the location where the specific expected result files can be found
+results.loc=${queryset.artifacts.dir}/${queryset.dir}/${expected.results.dir}
+
+#
+# where to find the vdb's, which is used to define the vdb.definition setting in the deploy.properties
+vdb.loc=${vdb.artifacts.dir}
+
+# turn off the configuration of the datastores (data refresh) and connector bindings (setting the datastore connection info)
+#disable_datastore=true
+
+# the location where newly generated expected results will be created (resultmode = generate)
+generatedir=target/bulk-query-tests/${queryset.dir}/generate
+# the comparison reports for each query set
+outputdir=target/bulk-query-tests/${queryset.dir}/output
+
+# write the summary files out to this location to make it easier to assimilate the files
+summarydir=target/bulk-query-tests
+
+
+# transaction types
+# See the TransactionFactory for the list of types
+#### NOTE- this property is being set in the scenario properties file
+#transaction-option=off
+#transaction-option=auto
+#transaction-option=local
+
+# resultmode options:
+# - compare : compare actual results to expected results
+# - generate : create new expected results
+# - none : run the queries, only report when errors occur
+#resultmode=none
+resultmode=compare
+#resultmode=generate
+
+
+# this is the deploy.properties file which will be used to run all the tests
+# it will have these properties updated:
+# 1 - vdb.definition (which will be based on vdb.loc)
+deployprops.loc=${project.loc}/target/classes/ctc_tests/deploy.properties
+
+process-batch = 20
+connector-batch = 20
+
+# this is how to submit queries to Teiid
+# default is true
+execute.in.batch=false
+
+##########################################
+# properties for Teiid connection
+##########################################
+
+connection-type=datasource
+
+#driver=org.teiid.jdbc.TeiidDataSource
+
+### driver and url for connecting in server mode
+#driver=org.teiid.jdbc.TeiidDriver
+#URL=jdbc:metamatrix:${vdb}@mm://localhost:31000;user=admin;password=teiid
+
+### driver and url for running in embedded mode
+driver=com.metamatrix.jdbc.EmbeddedDataSource
+URL=jdbc:metamatrix:${vdb.name}@target/classes/ctc_tests/deploy.properties;version=1;user=admin;password=teiid
+User=admin
+Password=teiid
+
+### dont define Database, it will be set based on the scenario vdb
+DatabaseName=${vdb.name}
+ServerName=target/classes/ctc_tests/deploy.properties
+
+#PortNumber=0
+#application-name=bqt-test
+
+# jboss
+# mm.ds-jndiname=java:mmXA
+# usertxn-jndiname=UserTransaction
+
+# weblogic
+mm.ds-jndiname=mmXA
+usertxn-jndiname=java:comp/UserTransaction
+
+
+# These mappings control what datasource is mapped to which model when the -Dusedatasources=<comma seperated datasource names> option is used
+# or the system environment is set.
+#
+# By providing the numerical order, it indicates which datasource to assign based on the order in the usedatasources property.
+#
+# If -Dusedatasources is not set, then the datasource will be assigned in the order they are calling to obtain a datasource.
+#
+#
+
Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/ctc-test.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml 2010-01-19 19:40:36 UTC (rev 1750)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml 2010-01-19 19:43:23 UTC (rev 1751)
@@ -8,50 +8,46 @@
</classpath>
</taskdef>
- <target name="main" depends="init" if="" unless="" description="create all property files">
+ <target name="main" depends="init, is.config.file, set.default.config.file, set.config.file"
+ if="" unless="" description="create all property files">
<antcall target="run.all.test" inheritall="true" />
<antcall target="run.single.test" inheritall="true" />
<available file="${ERROR_FILE}" property="error.flagged"/>
<fail if="error.flagged" message="One or more ctc tests failed" />
-
-
+
</target>
-
<target name="init" depends="set.os, set.win, set.linux" >
<property name="ERROR_FILE" value="${root_output}/ERROR_FOUND.txt" />
- <available file="${scenario.dir}" type="dir" property="dir.exist"/>
- <fail unless="dir.exist" message="Scenario directory ${scenario.dir} does not exist" />
+ <available file="${scenario.dir}" type="dir" property="scenario.dir.exist"/>
+ <fail unless="scenario.dir.exist" message="Scenario directory ${scenario.dir} does not exist or was not specified." />
+ <available file="${queryset.artifacts.dir}" type="dir" property="queryset.dir.exist"/>
+ <fail unless="queryset.dir.exist" message="QuerySet directory ${queryset.artifacts.dir} does not exist or was not specified." />
- <condition property="all">
- <not>
- <isset property="single"/>
- </not>
+ <available file="${vdb.artifacts.dir}" type="dir" property="vdb.dir.exist"/>
+ <fail unless="vdb.dir.exist" message="VDB artifacts directory ${vdb.artifacts.dir} does not exist or was not specified." />
+
+ <condition property="single">
+ <available file="${scenario.dir}/${scenario.file}" />
</condition>
<delete file="${ERROR_FILE}"/>
-
<copy todir="${proj_dir}/lib" failonerror="false">
<fileset dir="${third.party.jars.dir}"/>
</copy>
+
+
</target>
-
-
- <target name="copy.third.party.jars">
-
-
- </target>
-
<target name="set.win"
if="WinOS">
@@ -70,10 +66,36 @@
<property name="root_output" value="${proj.dir}/target/bulk-query-tests" />
<property name="proj_dir" value="${proj.dir}" />
+ </target>
+
+ <target name="is.config.file">
+
+ <available file="${config.file}" type="file" property="config.exist"/>
+
+ <condition property="set.config.default">
+ <not>
+ <isset property="config.exist"/>
+ </not>
+ </condition>
+
+ </target>
+
+ <target name="set.default.config.file"
+ if="set.config.default">
+ <property name="use.config.file" value="${proj_dir}/src/main/resources/ctc_tests/ctc-test.properties" />
+ <echo>DEFAULT CONFIG: ${use.config.file}</echo>
+
+ </target>
+
+ <target name="set.config.file"
+ unless="set.config.default" >
+ <property name="use.config.file" value="${config.file}" />
+ <echo>USE CONFIG: ${use.config.file}</echo>
+
</target>
<target name="run.all.test"
- if="all" >
+ unless="single" >
<echo>Executing ALL Scenarios</echo>
<for param="file">
@@ -113,13 +135,8 @@
<target name="exec.win"
if="WinOS">
<echo>Scenario property file ${scenario.file}</echo>
-<!--
- Dont convert the config file, it fails
- <pathconvert targetos="unix" property="config_file" >
- <map from="\" to="/"/>
- <path location="${config.file}"/>
- </pathconvert>
--->
+ <echo>Config property file ${use.config.file}</echo>
+
<pathconvert targetos="unix" property="scenario_file" >
<map from="\" to="/"/>
<path location="${scenario.file}"/>
@@ -144,12 +161,12 @@
</fileset>
</classpath>
<jvmarg value="-Xmx1024m" />
- <jvmarg value="-Dmetamatrix.sockets=true" />
- <jvmarg value="-Dconfig=${config.file}" />
+ <jvmarg value="-Dconfig=${use.config.file}" />
<jvmarg value="-Dscenariofile=${scenario_file}" />
<jvmarg value="-Dqueryset.artifacts.dir=${queryset_artifacts_dir}" />
<jvmarg value="-Dvdb.artifacts.dir=${vdb_artifacts_dir}" />
-
+ <jvmarg value="-Dquery.scenario.classname=${query.scenario.classname}" />
+
</java>
@@ -159,7 +176,10 @@
<target name="exec.linux"
if="UnixOS">
<echo>Scenario property file ${scenario.file}</echo>
+ <echo>Config property file ${use.config.file}</echo>
+ <echo>Query Artifacts ${queryset.artifacts.dir}</echo>
+
<java classname="org.teiid.test.client.TestClient" fork="true" >
<classpath>
<pathelement path="${maven.runtime.classpath}" />
@@ -168,13 +188,21 @@
</fileset>
</classpath>
<jvmarg value="-Xmx1024m" />
- <jvmarg value="-Dmetamatrix.sockets=true" />
- <jvmarg value="-Dconfig=${config.file}" />
+ <jvmarg value="-Dconfig=${use.config.file}" />
<jvmarg value="-Dscenariofile=${scenario.file}" />
<jvmarg value="-Dqueryset.artifacts.dir=${queryset.artifacts.dir}" />
<jvmarg value="-Dvdb.artifacts.dir=${vdb.artifacts.dir}" />
+ <jvmarg value="-Dquery.scenario.classname=${query.scenario.classname}" />
+
</java>
+
+ <!--
+ <jvmarg value="-Dmetamatrix.sockets=true" />
+ <jvmarg value="-Xdebug" />
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=y" />
+
+ -->
</target>
Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery1.txt
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery1.txt (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery1.txt 2010-01-19 19:43:23 UTC (rev 1751)
@@ -0,0 +1,106 @@
+integer string
+e1 e2
+0 0
+1 1
+2 2
+3 3
+4 4
+5 5
+6 6
+7 7
+8 8
+9 9
+10 10
+11 11
+12 12
+13 13
+14 14
+15 15
+16 16
+17 17
+18 18
+19 19
+20 20
+21 21
+22 22
+23 23
+24 24
+25 25
+26 26
+27 27
+28 28
+29 29
+30 30
+31 31
+32 32
+33 33
+34 34
+35 35
+36 36
+37 37
+38 38
+39 39
+40 40
+41 41
+42 42
+43 43
+44 44
+45 45
+46 46
+47 47
+48 48
+49 49
+50 50
+51 51
+52 52
+53 53
+54 54
+55 55
+56 56
+57 57
+58 58
+59 59
+60 60
+61 61
+62 62
+63 63
+64 64
+65 65
+66 66
+67 67
+68 68
+69 69
+70 70
+71 71
+72 72
+73 73
+74 74
+75 75
+76 76
+77 77
+78 78
+79 79
+80 80
+81 81
+82 82
+83 83
+84 84
+85 85
+86 86
+87 87
+88 88
+89 89
+90 90
+91 91
+92 92
+93 93
+94 94
+95 95
+96 96
+97 97
+98 98
+99 99
+Row Count : 100
+getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
+e1 4 Transaction java.lang.Integer e1 integer pm1 g1 11 10 0 false false false true 0 false true true true
+e2 12 Transaction java.lang.String e2 string pm1 g1 50 50 0 false true false true 1 false true true true
Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery1.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery2.txt
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery2.txt (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery2.txt 2010-01-19 19:43:23 UTC (rev 1751)
@@ -0,0 +1,56 @@
+integer string
+e1 e2
+0 0
+1 1
+2 2
+3 3
+4 4
+5 5
+6 6
+7 7
+8 8
+9 9
+10 10
+11 11
+12 12
+13 13
+14 14
+15 15
+16 16
+17 17
+18 18
+19 19
+20 20
+21 21
+22 22
+23 23
+24 24
+25 25
+26 26
+27 27
+28 28
+29 29
+30 30
+31 31
+32 32
+33 33
+34 34
+35 35
+36 36
+37 37
+38 38
+39 39
+40 40
+41 41
+42 42
+43 43
+44 44
+45 45
+46 46
+47 47
+48 48
+49 49
+Row Count : 50
+getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
+e1 4 Transaction java.lang.Integer e1 integer pm1 g2 11 10 0 false false false true 1 false true true true
+e2 12 Transaction java.lang.String e2 string pm1 g2 50 50 0 false true false true 1 false true true true
Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery2.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery3.txt
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery3.txt (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery3.txt 2010-01-19 19:43:23 UTC (rev 1751)
@@ -0,0 +1,106 @@
+integer string
+E1 E2
+0 0
+1 1
+2 2
+3 3
+4 4
+5 5
+6 6
+7 7
+8 8
+9 9
+10 10
+11 11
+12 12
+13 13
+14 14
+15 15
+16 16
+17 17
+18 18
+19 19
+20 20
+21 21
+22 22
+23 23
+24 24
+25 25
+26 26
+27 27
+28 28
+29 29
+30 30
+31 31
+32 32
+33 33
+34 34
+35 35
+36 36
+37 37
+38 38
+39 39
+40 40
+41 41
+42 42
+43 43
+44 44
+45 45
+46 46
+47 47
+48 48
+49 49
+50 50
+51 51
+52 52
+53 53
+54 54
+55 55
+56 56
+57 57
+58 58
+59 59
+60 60
+61 61
+62 62
+63 63
+64 64
+65 65
+66 66
+67 67
+68 68
+69 69
+70 70
+71 71
+72 72
+73 73
+74 74
+75 75
+76 76
+77 77
+78 78
+79 79
+80 80
+81 81
+82 82
+83 83
+84 84
+85 85
+86 86
+87 87
+88 88
+89 89
+90 90
+91 91
+92 92
+93 93
+94 94
+95 95
+96 96
+97 97
+98 98
+99 99
+Row Count : 100
+getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
+E1 4 Transaction java.lang.Integer E1 integer pm2 G1 6 5 0 false false false true 0 false true true true
+E2 12 Transaction java.lang.String E2 string pm2 G1 50 50 0 false true false true 1 false true true true
Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery3.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery4.txt
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery4.txt (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery4.txt 2010-01-19 19:43:23 UTC (rev 1751)
@@ -0,0 +1,56 @@
+integer string
+E1 E2
+0 0
+1 1
+2 2
+3 3
+4 4
+5 5
+6 6
+7 7
+8 8
+9 9
+10 10
+11 11
+12 12
+13 13
+14 14
+15 15
+16 16
+17 17
+18 18
+19 19
+20 20
+21 21
+22 22
+23 23
+24 24
+25 25
+26 26
+27 27
+28 28
+29 29
+30 30
+31 31
+32 32
+33 33
+34 34
+35 35
+36 36
+37 37
+38 38
+39 39
+40 40
+41 41
+42 42
+43 43
+44 44
+45 45
+46 46
+47 47
+48 48
+49 49
+Row Count : 50
+getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
+E1 4 Transaction java.lang.Integer E1 integer pm2 G2 6 5 0 false false false true 1 false true true true
+E2 12 Transaction java.lang.String E2 string pm2 G2 50 50 0 false true false true 1 false true true true
Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery4.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery5.txt
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery5.txt (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery5.txt 2010-01-19 19:43:23 UTC (rev 1751)
@@ -0,0 +1,7 @@
+integer string
+e1 e2
+1000 '1000'
+Row Count : 1
+getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
+e1 4 Transaction java.lang.Integer e1 integer pm1 g1 11 10 0 false false false true 0 false true true true
+e2 12 Transaction java.lang.String e2 string pm1 g1 50 50 0 false true false true 1 false true true true
Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery5.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery6.txt
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery6.txt (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery6.txt 2010-01-19 19:43:23 UTC (rev 1751)
@@ -0,0 +1,7 @@
+integer string
+e1 e2
+1000 blah
+Row Count : 1
+getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
+e1 4 Transaction java.lang.Integer e1 integer pm1 g1 11 10 0 false false false true 0 false true true true
+e2 12 Transaction java.lang.String e2 string pm1 g1 50 50 0 false true false true 1 false true true true
Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery6.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery7.txt
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery7.txt (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery7.txt 2010-01-19 19:43:23 UTC (rev 1751)
@@ -0,0 +1,6 @@
+integer string
+e1 e2
+Row Count : 0
+getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
+e1 4 Transaction java.lang.Integer e1 integer pm1 g1 11 10 0 false false false true 0 false true true true
+e2 12 Transaction java.lang.String e2 string pm1 g1 50 50 0 false true false true 1 false true true true
Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery7.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery8.txt
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery8.txt (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery8.txt 2010-01-19 19:43:23 UTC (rev 1751)
@@ -0,0 +1,7 @@
+integer string
+e1 e2
+1100 '1100'
+Row Count : 1
+getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
+e1 4 Transaction java.lang.Integer e1 integer pm1 g1 11 10 0 false false false true 0 false true true true
+e2 12 Transaction java.lang.String e2 string pm1 g1 50 50 0 false true false true 1 false true true true
Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery8.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery1.txt
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery1.txt (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery1.txt 2010-01-19 19:43:23 UTC (rev 1751)
@@ -0,0 +1,106 @@
+integer string
+e1 e2
+0 0
+1 1
+2 2
+3 3
+4 4
+5 5
+6 6
+7 7
+8 8
+9 9
+10 10
+11 11
+12 12
+13 13
+14 14
+15 15
+16 16
+17 17
+18 18
+19 19
+20 20
+21 21
+22 22
+23 23
+24 24
+25 25
+26 26
+27 27
+28 28
+29 29
+30 30
+31 31
+32 32
+33 33
+34 34
+35 35
+36 36
+37 37
+38 38
+39 39
+40 40
+41 41
+42 42
+43 43
+44 44
+45 45
+46 46
+47 47
+48 48
+49 49
+50 50
+51 51
+52 52
+53 53
+54 54
+55 55
+56 56
+57 57
+58 58
+59 59
+60 60
+61 61
+62 62
+63 63
+64 64
+65 65
+66 66
+67 67
+68 68
+69 69
+70 70
+71 71
+72 72
+73 73
+74 74
+75 75
+76 76
+77 77
+78 78
+79 79
+80 80
+81 81
+82 82
+83 83
+84 84
+85 85
+86 86
+87 87
+88 88
+89 89
+90 90
+91 91
+92 92
+93 93
+94 94
+95 95
+96 96
+97 97
+98 98
+99 99
+Row Count : 100
+getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
+e1 4 Transaction java.lang.Integer e1 integer pm1 g1 11 10 0 false false false true 0 false true true true
+e2 12 Transaction java.lang.String e2 string pm1 g1 50 50 0 false true false true 1 false true true true
Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery1.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery2.txt
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery2.txt (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery2.txt 2010-01-19 19:43:23 UTC (rev 1751)
@@ -0,0 +1,56 @@
+integer string
+e1 e2
+0 0
+1 1
+2 2
+3 3
+4 4
+5 5
+6 6
+7 7
+8 8
+9 9
+10 10
+11 11
+12 12
+13 13
+14 14
+15 15
+16 16
+17 17
+18 18
+19 19
+20 20
+21 21
+22 22
+23 23
+24 24
+25 25
+26 26
+27 27
+28 28
+29 29
+30 30
+31 31
+32 32
+33 33
+34 34
+35 35
+36 36
+37 37
+38 38
+39 39
+40 40
+41 41
+42 42
+43 43
+44 44
+45 45
+46 46
+47 47
+48 48
+49 49
+Row Count : 50
+getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
+e1 4 Transaction java.lang.Integer e1 integer pm1 g2 11 10 0 false false false true 1 false true true true
+e2 12 Transaction java.lang.String e2 string pm1 g2 50 50 0 false true false true 1 false true true true
Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery2.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery3.txt
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery3.txt (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery3.txt 2010-01-19 19:43:23 UTC (rev 1751)
@@ -0,0 +1,106 @@
+integer string
+E1 E2
+0 0
+1 1
+2 2
+3 3
+4 4
+5 5
+6 6
+7 7
+8 8
+9 9
+10 10
+11 11
+12 12
+13 13
+14 14
+15 15
+16 16
+17 17
+18 18
+19 19
+20 20
+21 21
+22 22
+23 23
+24 24
+25 25
+26 26
+27 27
+28 28
+29 29
+30 30
+31 31
+32 32
+33 33
+34 34
+35 35
+36 36
+37 37
+38 38
+39 39
+40 40
+41 41
+42 42
+43 43
+44 44
+45 45
+46 46
+47 47
+48 48
+49 49
+50 50
+51 51
+52 52
+53 53
+54 54
+55 55
+56 56
+57 57
+58 58
+59 59
+60 60
+61 61
+62 62
+63 63
+64 64
+65 65
+66 66
+67 67
+68 68
+69 69
+70 70
+71 71
+72 72
+73 73
+74 74
+75 75
+76 76
+77 77
+78 78
+79 79
+80 80
+81 81
+82 82
+83 83
+84 84
+85 85
+86 86
+87 87
+88 88
+89 89
+90 90
+91 91
+92 92
+93 93
+94 94
+95 95
+96 96
+97 97
+98 98
+99 99
+Row Count : 100
+getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
+E1 4 Transaction java.lang.Integer E1 integer pm2 G1 6 5 0 false false false true 0 false true true true
+E2 12 Transaction java.lang.String E2 string pm2 G1 50 50 0 false true false true 1 false true true true
Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery3.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery4.txt
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery4.txt (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery4.txt 2010-01-19 19:43:23 UTC (rev 1751)
@@ -0,0 +1,56 @@
+integer string
+E1 E2
+0 0
+1 1
+2 2
+3 3
+4 4
+5 5
+6 6
+7 7
+8 8
+9 9
+10 10
+11 11
+12 12
+13 13
+14 14
+15 15
+16 16
+17 17
+18 18
+19 19
+20 20
+21 21
+22 22
+23 23
+24 24
+25 25
+26 26
+27 27
+28 28
+29 29
+30 30
+31 31
+32 32
+33 33
+34 34
+35 35
+36 36
+37 37
+38 38
+39 39
+40 40
+41 41
+42 42
+43 43
+44 44
+45 45
+46 46
+47 47
+48 48
+49 49
+Row Count : 50
+getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
+E1 4 Transaction java.lang.Integer E1 integer pm2 G2 6 5 0 false false false true 1 false true true true
+E2 12 Transaction java.lang.String E2 string pm2 G2 50 50 0 false true false true 1 false true true true
Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery4.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery5.txt
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery5.txt (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery5.txt 2010-01-19 19:43:23 UTC (rev 1751)
@@ -0,0 +1,7 @@
+integer string
+e1 e2
+1000 '1000'
+Row Count : 1
+getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
+e1 4 Transaction java.lang.Integer e1 integer pm1 g1 11 10 0 false false false true 0 false true true true
+e2 12 Transaction java.lang.String e2 string pm1 g1 50 50 0 false true false true 1 false true true true
Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery5.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery6.txt
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery6.txt (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery6.txt 2010-01-19 19:43:23 UTC (rev 1751)
@@ -0,0 +1,7 @@
+integer string
+e1 e2
+1000 blah
+Row Count : 1
+getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
+e1 4 Transaction java.lang.Integer e1 integer pm1 g1 11 10 0 false false false true 0 false true true true
+e2 12 Transaction java.lang.String e2 string pm1 g1 50 50 0 false true false true 1 false true true true
Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery6.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery7.txt
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery7.txt (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery7.txt 2010-01-19 19:43:23 UTC (rev 1751)
@@ -0,0 +1,6 @@
+integer string
+e1 e2
+Row Count : 0
+getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
+e1 4 Transaction java.lang.Integer e1 integer pm1 g1 11 10 0 false false false true 0 false true true true
+e2 12 Transaction java.lang.String e2 string pm1 g1 50 50 0 false true false true 1 false true true true
Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery7.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery8.txt
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery8.txt (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery8.txt 2010-01-19 19:43:23 UTC (rev 1751)
@@ -0,0 +1,7 @@
+integer string
+e1 e2
+1100 '1100'
+Row Count : 1
+getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
+e1 4 Transaction java.lang.Integer e1 integer pm1 g1 11 10 0 false false false true 0 false true true true
+e2 12 Transaction java.lang.String e2 string pm1 g1 50 50 0 false true false true 1 false true true true
Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery8.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/TestPhysicalQueries.xml
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/TestPhysicalQueries.xml (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/TestPhysicalQueries.xml 2010-01-19 19:43:23 UTC (rev 1751)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+
+<!-- * =====================================================================* -->
+<!-- * Testing simple transactions * -->
+<!-- * =====================================================================* -->
+
+<query name="TestQuery1">select * from pm1.g1 where e1 >= 0 order by e1
+</query>
+
+<query name="TestQuery2">select * from pm1.g2 where e1 >= 0 order by e1</query>
+<query name="TestQuery3">select * from pm2.g1 where e1 >= 0 order by e1</query>
+<query name="TestQuery4">select * from pm2.g2 where e1 >= 0 order by e1</query>
+
+
+<query name="TestQuery5">
+ <sql updatecnt="1">insert into pm1.g1 (e1, e2) values(?, ?)
+ <parm type="integer">1000</parm>
+ <parm type="string">'1000'</parm>
+ </sql>
+ <sql>select * from pm1.g1 where e1 = 1000</sql>
+</query>
+
+<query name="TestQuery6">
+ <sql updatecnt="1">insert into pm1.g1 (e1, e2) values(?, ?)
+ <parm type="integer">1000</parm>
+ <parm type="string">'1000'</parm>
+ </sql>
+ <sql updatecnt="1">update pm1.g1 set e2='blah' where e1 = ?
+ <parm type="integer">1000</parm>
+ </sql>
+ <sql>select * from pm1.g1 where e2 = 'blah'</sql>
+</query>
+
+
+<query name="TestQuery7">
+ <sql updatecnt="1">insert into pm1.g1 (e1, e2) values(?, ?)
+ <parm type="integer">1000</parm>
+ <parm type="string">'1000'</parm>
+ </sql>
+ <sql rowCount="1">select * from pm1.g1 where e1 = 1000</sql>
+ <sql updatecnt="1">delete from pm1.g1 where pm1.g1.e1 = 1000</sql>
+ <sql>select * from pm1.g1 where e1 > 999</sql>
+</query>
+
+<query name="TestQuery8">
+ <sql updatecnt="1">insert into pm1.g1 (e1, e2) values(?, ?)
+ <parm type="integer">1100</parm>
+ <parm type="string">'1100'</parm>
+ </sql>
+ <sql updatecnt="1">insert into pm1.g2 (e1, e2) values(?, ?)
+ <parm type="integer">1100</parm>
+ <parm type="string">'1100'</parm>
+ </sql>
+
+ <sql rowCount="1">select a.* from pm1.g1 as a, pm1.g2 as b where a.e1 = 1100 and a.e1=b.e1</sql>
+
+</query>
+
+
+</root>
+
Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/TestPhysicalQueries.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/test-integration/db/src/main/resources/ctc_tests/scenarios/client_test_txnoff.properties
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/scenarios/client_test_txnoff.properties (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/scenarios/client_test_txnoff.properties 2010-01-19 19:43:23 UTC (rev 1751)
@@ -0,0 +1,50 @@
+# this the default client test scenario file.
+#
+# A scenerio describes what query set to use (queries and expected results) and which vdb to use to execute
+# the queries against.
+
+# The scenario.properties file is required, but any property can also be passed in as a System property or in the
+# config properties file. Also, the scenario.properties override System properties and config properties.
+#
+# NOTE: These properties are used to substitute in the config properties files (see default = ctc-test-properties)
+# so that each scenario is able to drive its test case.
+
+#
+# To define a scenario file:
+#
+#----------------------------
+# Properties:
+#
+# 1. queryset.dir - points to a directory that represents a query set (queries and expected results)
+# 2. test.queries.dir - must be a subdirectory under the queryset.dir that contains the test query.
+# 3 expected.results.dir - must be a subdirectory under the queryset.dir that contains all the related
+# expected result files to use to validate the test_queries against.
+#
+# NOTE: There maybe multiple expected_results directories (by different names of course) sometimes depending on the datasources
+# that are being used by the vdb. Therefore, the expected_results.dir is specified so that a different set of
+# expected results can be specified for the same query set.
+#
+# 4. vdb.name - is the vdb to use for this scenario
+#
+#
+#----------------------------
+
+
+queryset.dir=rdbms
+
+test.queries.dir=test_queries
+expected.results.dir=client_test_txnoff_expected_results
+
+vdb.name=Transaction
+
+
+transaction-option=off
+
+
+
+
+
+
+
+
+
Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/scenarios/client_test_txnoff.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/test-integration/db/src/main/resources/ctc_tests/scenarios/client_test_txnon.properties
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/scenarios/client_test_txnon.properties (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/scenarios/client_test_txnon.properties 2010-01-19 19:43:23 UTC (rev 1751)
@@ -0,0 +1,47 @@
+# this the default client test scenario file.
+#
+# A scenerio describes what query set to use (queries and expected results) and which vdb to use to execute
+# the queries against.
+
+# The scenario.properties file is required, but any property can also be passed in as a System property or in the
+# config properties file. Also, the scenario.properties override System properties and config properties.
+#
+# NOTE: These properties are used to substitute in the config properties files (see default = ctc-test-properties)
+# so that each scenario is able to drive its test case.
+
+#
+# To define a scenario file:
+#
+#----------------------------
+# Properties:
+#
+# 1. queryset.dir - points to a directory that represents a query set (queries and expected results)
+# 2. test.queries.dir - must be a subdirectory under the queryset.dir that contains the test query.
+# 3 expected.results.dir - must be a subdirectory under the queryset.dir that contains all the related
+# expected result files to use to validate the test_queries against.
+#
+# NOTE: There maybe multiple expected_results directories (by different names of course) sometimes depending on the datasources
+# that are being used by the vdb. Therefore, the expected_results.dir is specified so that a different set of
+# expected results can be specified for the same query set.
+#
+# 4. vdb.name - is the vdb to use for this scenario
+#
+#
+#----------------------------
+
+
+queryset.dir=rdbms
+
+test.queries.dir=test_queries
+expected.results.dir=client_test_txnon_expected_results
+
+vdb.name=Transaction
+
+
+transaction-option=on
+
+
+
+
+
+
Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/scenarios/client_test_txnon.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/test-integration/db/src/main/resources/ctc_tests/scenarios/scenario.properties.template
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/scenarios/scenario.properties.template (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/scenarios/scenario.properties.template 2010-01-19 19:43:23 UTC (rev 1751)
@@ -0,0 +1,48 @@
+# this is a template file for creating a scenario file to drive a client test.
+#
+# A scenerio describes what query set to use (queries and expected results) and which vdb to use to execute
+# the queries against.
+
+# The scenario.properties file is required, but any property can also be passed in as a System property or in the
+# config properties file. Also, the scenario.properties override System properties and config properties.
+#
+# NOTE: These properties are used to substitute in the config properties files (see default = ctc-test-properties)
+# so that each scenario is able to drive its test case.
+
+#
+# To define a scenario file:
+#
+#----------------------------
+# Properties:
+#
+# 1. queryset.dir - points to a directory that represents a query set (queries and expected results)
+# 2. test.queries.dir - must be a subdirectory under the queryset.dir that contains the test query.
+# 3 expected.results.dir - must be a subdirectory under the queryset.dir that contains all the related
+# expected result files to use to validate the test_queries against.
+#
+# NOTE: There maybe multiple expected_results directories (by different names of course) sometimes depending on the datasources
+# that are being used by the vdb. Therefore, the expected_results.dir is specified so that a different set of
+# expected results can be specified for the same query set.
+#
+# 4. vdb.name - is the vdb to use for this scenario
+#
+#
+#----------------------------
+
+
+queryset.dir=select
+
+test.queries.dir=test_queries
+expected.results.dir=expected_results
+
+vdb.name=<vdbname>
+
+
+
+
+
+
+
+
+
+
More information about the teiid-commits
mailing list