Tag: cws_dev300_dba30h User: fs Date: 2008-08-06 11:41:56+0000 Removed: dba/dbaccess/util/defs/wntmsci10
Modified: dba/dbaccess/qa/complex/dbaccess/CRMDatabase.java dba/dbaccess/qa/complex/dbaccess/QueryInQuery.java dba/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java dba/dbaccess/qa/complex/dbaccess/dbaccess.sce Log: RESYNC: (1.6-1.7); FILE MERGED 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.6.62.2&r2=1.6.62.3 Delta lines: +24 -8 -------------------- --- CRMDatabase.java 2008-07-23 13:01:31+0000 1.6.62.2 +++ CRMDatabase.java 2008-08-06 11:41:24+0000 1.6.62.3 @@ -30,6 +30,7 @@ package complex.dbaccess; import com.sun.star.container.ElementExistException; +import com.sun.star.io.IOException; import com.sun.star.lang.WrappedTargetException; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.sdb.XSingleSelectQueryComposer; @@ -85,23 +86,37 @@ } // -------------------------------------------------------------------------------------------------------- - public void close() + public void close() throws SQLException, IOException { + m_database.store(); m_database.close(); } // -------------------------------------------------------------------------------------------------------- private void createTables() throws SQLException { - HsqlTableDescriptor table = new HsqlTableDescriptor( "products", + HsqlTableDescriptor table = new HsqlTableDescriptor( "categories", new HsqlColumnDescriptor[] { new HsqlColumnDescriptor( "ID", "INTEGER", HsqlColumnDescriptor.PRIMARY ), - new HsqlColumnDescriptor( "Name", "VARCHAR(50)" ) } ); + new HsqlColumnDescriptor( "Name", "VARCHAR(50)" ), + new HsqlColumnDescriptor( "Description", "VARCHAR(1024)" ), + new HsqlColumnDescriptor( "Image", "LONGVARBINARY" ) } ); + m_database.createTable( table, true ); + + m_database.executeSQL( "INSERT INTO \"categories\" ( \"ID\", \"Name\" ) VALUES ( 1, 'Food' )" ); + m_database.executeSQL( "INSERT INTO \"categories\" ( \"ID\", \"Name\" ) VALUES ( 2, 'Furniture' )" ); + + table = new HsqlTableDescriptor( "products", + new HsqlColumnDescriptor[] { + new HsqlColumnDescriptor( "ID", "INTEGER", HsqlColumnDescriptor.PRIMARY ), + new HsqlColumnDescriptor( "Name", "VARCHAR(50)" ), + new HsqlColumnDescriptor( "CategoryID", "INTEGER", HsqlColumnDescriptor.REQUIRED, "categories", "ID" ) } ); m_database.createTable( table, true ); - m_database.executeSQL( "INSERT INTO \"products\" VALUES ( 1, 'Oranges' )" ); - m_database.executeSQL( "INSERT INTO \"products\" VALUES ( 2, 'Apples' )" ); - m_database.executeSQL( "INSERT INTO \"products\" VALUES ( 3, 'Pears' )" ); + m_database.executeSQL( "INSERT INTO \"products\" VALUES ( 1, 'Oranges', 1 )" ); + m_database.executeSQL( "INSERT INTO \"products\" VALUES ( 2, 'Apples', 1 )" ); + m_database.executeSQL( "INSERT INTO \"products\" VALUES ( 3, 'Pears', 1 )" ); + m_database.executeSQL( "INSERT INTO \"products\" VALUES ( 4, 'Strawberries', 1 )" ); table = new HsqlTableDescriptor( "customers", new HsqlColumnDescriptor[] { @@ -115,6 +130,7 @@ m_database.executeSQL( "INSERT INTO \"customers\" VALUES(1,'Food, Inc.','Down Under','Melbourne','509') " ); m_database.executeSQL( "INSERT INTO \"customers\" VALUES(2,'Simply Delicious','Down Under','Melbourne','518') " ); m_database.executeSQL( "INSERT INTO \"customers\" VALUES(3,'Pure Health','10 Fish St.','San Francisco','94107') " ); + m_database.executeSQL( "INSERT INTO \"customers\" VALUES(4,'Milk And More','Arlington Road 21','Dublin','31021') " ); table = new HsqlTableDescriptor( "orders", new HsqlColumnDescriptor[] { Directory: /dba/dbaccess/qa/complex/dbaccess/ ============================================= File [changed]: QueryInQuery.java Url: http://dba.openoffice.org/source/browse/dba/dbaccess/qa/complex/dbaccess/QueryInQuery.java?r1=1.6.62.2&r2=1.6.62.3 Delta lines: +5 -30 -------------------- --- QueryInQuery.java 2008-07-23 13:01:31+0000 1.6.62.2 +++ QueryInQuery.java 2008-08-06 11:41:27+0000 1.6.62.3 @@ -34,20 +34,15 @@ 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; import connectivity.tools.HsqlColumnDescriptor; import connectivity.tools.HsqlTableDescriptor; import connectivity.tools.RowSet; import com.sun.star.sdbc.XStatement; import com.sun.star.sdbc.XResultSet; -public class QueryInQuery extends complexlib.ComplexTestCase +public class QueryInQuery extends CRMBasedTestCase { - private CRMDatabase m_database; - // -------------------------------------------------------------------------------------------------------- public String[] getTestMethodNames() { @@ -61,24 +56,17 @@ } // -------------------------------------------------------------------------------------------------------- - private final XMultiServiceFactory getORB() - { - return (XMultiServiceFactory)param.getMSF(); - } - - // -------------------------------------------------------------------------------------------------------- public String getTestObjectName() { return "QueryInQuery"; } // -------------------------------------------------------------------------------------------------------- - private void createTestCase() + protected void createTestCase() { try { - m_database = new CRMDatabase( getORB() ); - + super.createTestCase(); m_database.getDatabase().getDataSource().createQuery( "query products", "SELECT * FROM \"products\"" ); } catch ( Exception e ) @@ -89,19 +77,6 @@ } // -------------------------------------------------------------------------------------------------------- - public void before() - { - createTestCase(); - } - - // -------------------------------------------------------------------------------------------------------- - public void after() - { - if ( m_database != null ) - m_database.close(); - } - - // -------------------------------------------------------------------------------------------------------- private void verifyEqualRowSetContent( int _outerCommandType, String _outerCommand, int _innerCommandType, String _innerCommand ) throws SQLException { RowSet outerRowSet = m_database.getDatabase().createRowSet( _outerCommandType, _outerCommand ); Directory: /dba/dbaccess/qa/complex/dbaccess/ ============================================= File [changed]: SingleSelectQueryComposer.java Url: http://dba.openoffice.org/source/browse/dba/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java?r1=1.8.26.2&r2=1.8.26.3 Delta lines: +53 -75 --------------------- --- SingleSelectQueryComposer.java 2008-07-23 13:01:31+0000 1.8.26.2 +++ SingleSelectQueryComposer.java 2008-08-06 11:41:30+0000 1.8.26.3 @@ -37,13 +37,13 @@ import com.sun.star.container.*; import com.sun.star.lang.XMultiServiceFactory; -import complexlib.ComplexTestCase; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.logging.Level; +import java.util.logging.Logger; -public class SingleSelectQueryComposer extends ComplexTestCase +public class SingleSelectQueryComposer extends CRMBasedTestCase { - private CRMDatabase m_database; private XSingleSelectQueryComposer m_composer; private final String complexFilter = "( \"ID\" = 1 AND \"Postal\" = '4' )" + @@ -71,43 +71,21 @@ } // -------------------------------------------------------------------------------------------------------- - private final XMultiServiceFactory getORB() - { - return (XMultiServiceFactory)param.getMSF(); - } - - // -------------------------------------------------------------------------------------------------------- private void createQueries() throws Exception { m_database.getDatabase().getDataSource().createQuery( innerProductsQuery, "SELECT * FROM \"products\"" ); } // -------------------------------------------------------------------------------------------------------- - public void before() - { - createTestCase(); - } - - // -------------------------------------------------------------------------------------------------------- - public void after() - { - if ( m_database != null ) - m_database.close(); - } - - // -------------------------------------------------------------------------------------------------------- - private void createTestCase() + protected void createTestCase() { try { - m_database = new CRMDatabase( getORB() ); + super.createTestCase(); createQueries(); - XMultiServiceFactory connectionFactory = (XMultiServiceFactory)UnoRuntime.queryInterface( - XMultiServiceFactory.class, m_database.getConnection() ); - m_composer = (XSingleSelectQueryComposer)UnoRuntime.queryInterface( - XSingleSelectQueryComposer.class, connectionFactory.createInstance( "com.sun.star.sdb.SingleSelectQueryComposer" ) ); + m_composer = createQueryComposer(); } catch ( Exception e ) Directory: /dba/dbaccess/qa/complex/dbaccess/ ============================================= File [changed]: dbaccess.sce Url: http://dba.openoffice.org/source/browse/dba/dbaccess/qa/complex/dbaccess/dbaccess.sce?r1=1.6.18.2&r2=1.6.18.3 Delta lines: +1 -0 ------------------- --- dbaccess.sce 2008-07-23 13:01:31+0000 1.6.18.2 +++ dbaccess.sce 2008-08-06 11:41:33+0000 1.6.18.3 @@ -5,3 +5,4 @@ -o complex.dbaccess.QueryInQuery -o complex.dbaccess.Storable -o complex.dbaccess.DataSource +-o complex.dbaccess.Parser Directory: /dba/dbaccess/util/defs/ =================================== File [removed]: wntmsci10 --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
