Author: vhalbert(a)redhat.com Date: 2010-02-15 09:44:36 -0500 (Mon, 15 Feb 2010) New Revision: 1823 Modified: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestInvalidQueries/TestInvalidQueries_TestQuery1.txt 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/TestInvalidQueries/TestInvalidQueries_TestQuery1.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 Log: Teiid-773 - testcase results regarding change for warren so that the expected results contain the query that was executed and when an error file is generated, it contains the query at the top Modified: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestInvalidQueries/TestInvalidQueries_TestQuery1.txt =================================================================== --- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestInvalidQueries/TestInvalidQueries_TestQuery1.txt 2010-02-12 21:28:39 UTC (rev 1822) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestInvalidQueries/TestInvalidQueries_TestQuery1.txt 2010-02-15 14:44:36 UTC (rev 1823) @@ -1,3 +1,4 @@ +select * pm1.g1 order by e1 com.metamatrix.jdbc.MMSQLException : Parsing error: Encountered "pm1.g1" at line 1, column 11. Was expecting one of: <EOF> Modified: 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 2010-02-12 21:28:39 UTC (rev 1822) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery1.txt 2010-02-15 14:44:36 UTC (rev 1823) @@ -1,3 +1,4 @@ +select * from pm1.g1 order by e1 integer string e1 e2 0 0 Modified: 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 2010-02-12 21:28:39 UTC (rev 1822) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery2.txt 2010-02-15 14:44:36 UTC (rev 1823) @@ -1,3 +1,4 @@ +select * from pm1.g2 where e1 >= 0 order by e1 integer string e1 e2 0 0 Modified: 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 2010-02-12 21:28:39 UTC (rev 1822) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery3.txt 2010-02-15 14:44:36 UTC (rev 1823) @@ -1,3 +1,4 @@ +select * from pm2.g1 where e1 >= 0 order by e1 integer string E1 E2 0 0 Modified: 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 2010-02-12 21:28:39 UTC (rev 1822) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery4.txt 2010-02-15 14:44:36 UTC (rev 1823) @@ -1,3 +1,4 @@ +select * from pm2.g2 where e1 >= 0 order by e1 integer string E1 E2 0 0 Modified: 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 2010-02-12 21:28:39 UTC (rev 1822) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery5.txt 2010-02-15 14:44:36 UTC (rev 1823) @@ -1,3 +1,4 @@ +select * from pm1.g1 where e1 = 1000 integer string e1 e2 1000 '1000' Modified: 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 2010-02-12 21:28:39 UTC (rev 1822) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery6.txt 2010-02-15 14:44:36 UTC (rev 1823) @@ -1,3 +1,4 @@ +select * from pm1.g1 where e2 = 'blah' integer string e1 e2 1000 blah Modified: 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 2010-02-12 21:28:39 UTC (rev 1822) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery7.txt 2010-02-15 14:44:36 UTC (rev 1823) @@ -1,3 +1,4 @@ +select * from pm1.g1 where e1 > 999 integer string e1 e2 Row Count : 0 Modified: 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 2010-02-12 21:28:39 UTC (rev 1822) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnoff_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery8.txt 2010-02-15 14:44:36 UTC (rev 1823) @@ -1,3 +1,4 @@ +select a.* from pm1.g1 as a, pm1.g2 as b where a.e1 = 1100 and a.e1=b.e1 integer string e1 e2 1100 '1100' Modified: trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestInvalidQueries/TestInvalidQueries_TestQuery1.txt =================================================================== --- trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestInvalidQueries/TestInvalidQueries_TestQuery1.txt 2010-02-12 21:28:39 UTC (rev 1822) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestInvalidQueries/TestInvalidQueries_TestQuery1.txt 2010-02-15 14:44:36 UTC (rev 1823) @@ -1,3 +1,4 @@ +select * pm1.g1 order by e1 com.metamatrix.jdbc.MMSQLException : Parsing error: Encountered "pm1.g1" at line 1, column 11. Was expecting one of: <EOF> Modified: 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 2010-02-12 21:28:39 UTC (rev 1822) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery1.txt 2010-02-15 14:44:36 UTC (rev 1823) @@ -1,3 +1,4 @@ +select * from pm1.g1 order by e1 integer string e1 e2 0 0 Modified: 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 2010-02-12 21:28:39 UTC (rev 1822) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery2.txt 2010-02-15 14:44:36 UTC (rev 1823) @@ -1,3 +1,4 @@ +select * from pm1.g2 where e1 >= 0 order by e1 integer string e1 e2 0 0 Modified: 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 2010-02-12 21:28:39 UTC (rev 1822) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery3.txt 2010-02-15 14:44:36 UTC (rev 1823) @@ -1,3 +1,4 @@ +select * from pm2.g1 where e1 >= 0 order by e1 integer string E1 E2 0 0 Modified: 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 2010-02-12 21:28:39 UTC (rev 1822) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery4.txt 2010-02-15 14:44:36 UTC (rev 1823) @@ -1,3 +1,4 @@ +select * from pm2.g2 where e1 >= 0 order by e1 integer string E1 E2 0 0 Modified: 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 2010-02-12 21:28:39 UTC (rev 1822) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery5.txt 2010-02-15 14:44:36 UTC (rev 1823) @@ -1,3 +1,4 @@ +select * from pm1.g1 where e1 = 1000 integer string e1 e2 1000 '1000' Modified: 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 2010-02-12 21:28:39 UTC (rev 1822) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery6.txt 2010-02-15 14:44:36 UTC (rev 1823) @@ -1,3 +1,4 @@ +select * from pm1.g1 where e2 = 'blah' integer string e1 e2 1000 blah Modified: 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 2010-02-12 21:28:39 UTC (rev 1822) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery7.txt 2010-02-15 14:44:36 UTC (rev 1823) @@ -1,3 +1,4 @@ +select * from pm1.g1 where e1 > 999 integer string e1 e2 Row Count : 0 Modified: 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 2010-02-12 21:28:39 UTC (rev 1822) +++ trunk/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/client_test_txnon_expected_results/TestPhysicalQueries/TestPhysicalQueries_TestQuery8.txt 2010-02-15 14:44:36 UTC (rev 1823) @@ -1,3 +1,4 @@ +select a.* from pm1.g1 as a, pm1.g2 as b where a.e1 = 1100 and a.e1=b.e1 integer string e1 e2 1100 '1100'