Tag: cws_src680_dba24d User: fs Date: 2007-11-21 08:12:19+0000 Modified: dba/dbaccess/qa/complex/dbaccess/CRMDatabase.java dba/dbaccess/qa/complex/dbaccess/Query.java dba/dbaccess/qa/complex/dbaccess/QueryInQuery.java
Log: copying changes from CWS dba24c herein (premature resync) File Changes: Directory: /dba/dbaccess/qa/complex/dbaccess/ ============================================= File [changed]: CRMDatabase.java Url: http://dba.openoffice.org/source/browse/dba/dbaccess/qa/complex/dbaccess/CRMDatabase.java?r1=1.3.70.1&r2=1.3.70.2 Delta lines: +4 -3 ------------------- --- CRMDatabase.java 2007-11-21 07:47:26+0000 1.3.70.1 +++ CRMDatabase.java 2007-11-21 08:12:16+0000 1.3.70.2 @@ -4,9 +4,9 @@ * * $RCSfile: CRMDatabase.java,v $ * - * $Revision: 1.3.70.1 $ + * $Revision: 1.3.70.2 $ * - * last change: $Author: fs $ $Date: 2007/11/21 07:47:26 $ + * last change: $Author: fs $ $Date: 2007/11/21 08:12:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -208,7 +208,8 @@ m_database.getDataSource().createQuery( "parseable", "SELECT * FROM \"customers\"" ); m_database.getDataSource().createQuery( "parseable native", "SELECT * FROM INFORMATION_SCHEMA.SYSTEM_VIEWS", false ); - m_database.getDataSource().createQuery( "unparseable", "SELECT \"Postal\" || ' - ' || \"City\" AS \"concat\" FROM \"customers\"", false ); + m_database.getDataSource().createQuery( "unparseable", + "SELECT CAST( \"ID\" AS VARCHAR(3) ) AS \"ID_VARCHAR\" FROM \"products\"", false ); validateUnparseable(); } File [changed]: Query.java Url: http://dba.openoffice.org/source/browse/dba/dbaccess/qa/complex/dbaccess/Query.java?r1=1.3.70.1&r2=1.3.70.2 Delta lines: +3 -3 ------------------- --- Query.java 2007-11-21 07:47:26+0000 1.3.70.1 +++ Query.java 2007-11-21 08:12:16+0000 1.3.70.2 @@ -4,9 +4,9 @@ * * $RCSfile: Query.java,v $ * - * $Revision: 1.3.70.1 $ + * $Revision: 1.3.70.2 $ * - * last change: $Author: fs $ $Date: 2007/11/21 07:47:26 $ + * last change: $Author: fs $ $Date: 2007/11/21 08:12:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -103,7 +103,7 @@ String[][] expectedColumnNames = new String[][] { new String[] { "ID", "Name", "Address", "City", "Postal" }, new String[] { "TABLE_CATALOG", "TABLE_SCHEMA", "TABLE_NAME", "VIEW_DEFINITION", "CHECK_OPTION", "IS_UPDATABLE", "VALID" }, - new String[] { "concat" } + new String[] { "ID_VARCHAR" } }; for ( int i = 0; i < queryNames.length; ++i ) File [changed]: QueryInQuery.java Url: http://dba.openoffice.org/source/browse/dba/dbaccess/qa/complex/dbaccess/QueryInQuery.java?r1=1.3&r2=1.3.106.1 Delta lines: +5 -4 ------------------- --- QueryInQuery.java 2007-01-15 14:29:35+0000 1.3 +++ QueryInQuery.java 2007-11-21 08:12:16+0000 1.3.106.1 @@ -4,9 +4,9 @@ * * $RCSfile: QueryInQuery.java,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.106.1 $ * - * last change: $Author: vg $ $Date: 2007/01/15 14:29:35 $ + * last change: $Author: fs $ $Date: 2007/11/21 08:12:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -39,6 +39,7 @@ import com.sun.star.lang.WrappedTargetException; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.sdb.CommandType; +import com.sun.star.sdb.ErrorCondition; import com.sun.star.sdb.XSingleSelectQueryComposer; import com.sun.star.sdbc.SQLException; import com.sun.star.uno.UnoRuntime; @@ -208,7 +209,7 @@ boolean caughtExpected = false; try { rowSet.execute(); } - catch ( SQLException e ) { caughtExpected = e.SQLState.equals( "OB001" ); } + catch ( SQLException e ) { caughtExpected = ( e.ErrorCode == -com.sun.star.sdb.ErrorCondition.PARSER_CYCLIC_SUB_QUERIES ); } assure( "executing a query with cyclic nested sub queries should fail!", caughtExpected ); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
