queryviewer-devel

[<av...@us...>]

Update of /cvsroot/queryviewer/queryviewer/src/net/sourceforge/queryviewer
In directory sc8-pr-cvs1:/tmp/cvs-serv30733

Modified Files:
	JDBCConnectionImpl.java 
Log Message:
ajout de performQuery(String):String[][] et précédante version dépréciée
modification des constructeurs (toujours les anciens noms)
ajout d'un try/catch je sais plus où ;)


Index: JDBCConnectionImpl.java
===================================================================
RCS file: /cvsroot/queryviewer/queryviewer/src/net/sourceforge/queryviewer/JDBCConnectionImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JDBCConnectionImpl.java	16 Jun 2003 07:41:15 -0000	1.1
--- JDBCConnectionImpl.java	17 Jun 2003 00:20:36 -0000	1.2
***************
*** 4,9 ****
  
  import java.sql.Connection;
- import java.sql.ResultSetMetaData;
  import java.sql.DatabaseMetaData;
  import java.sql.SQLException;
  
--- 4,10 ----
  
  import java.sql.Connection;
  import java.sql.DatabaseMetaData;
+ import java.sql.ResultSet;
+ import java.sql.ResultSetMetaData;
  import java.sql.SQLException;
  
***************
*** 29,33 ****
  	 * @throws java.sql.SQLException Si la connexion n'a pu être établie
  	 */
! 	public JDBCQueryImpl( String driver, String url, String username, String password) 
  		throws QueryException {
  		super();
--- 30,34 ----
  	 * @throws java.sql.SQLException Si la connexion n'a pu être établie
  	 */
! 	public JDBCConnectionImpl( String driver, String url, String username, String password) 
  		throws QueryException {
  		super();
***************
*** 50,54 ****
  	 * @param connection la connexion qui sera utilisée pour effectuer les requêtes
  	 */
! 	public JDBCQueryImpl(Connection connection) 
      throws QueryException {
  		super();
--- 51,55 ----
  	 * @param connection la connexion qui sera utilisée pour effectuer les requêtes
  	 */
! 	public JDBCConnectionImpl(Connection connection) 
      throws QueryException {
  		super();
***************
*** 57,60 ****
--- 58,69 ----
  	}
  
+   /**
+    * @deprecated
+    */
+   public String[][] performQuery(Query q)
+     throws QueryException {
+     return this.performQuery(q.getQueryString());
+   }
+ 
  	/**
  	 * Exécution de la requête.
***************
*** 62,71 ****
  	 * @return un tableau à deux dimensions contenant les lignes et les colonnes de la requête
  	 */
! 	public synchronized String[][] performQuery(Query q) 
  		throws QueryException {
  		String[][] data = null;
  		try {
  			java.sql.Statement stmt = this.connection.createStatement();
! 			java.sql.ResultSet rs = stmt.executeQuery(q.getQueryString());
  			String [] title = getColumnNames(rs.getMetaData());
  			java.util.ArrayList ar = new java.util.ArrayList();
--- 71,80 ----
  	 * @return un tableau à deux dimensions contenant les lignes et les colonnes de la requête
  	 */
! 	public synchronized String[][] performQuery(String queryString) 
  		throws QueryException {
  		String[][] data = null;
  		try {
  			java.sql.Statement stmt = this.connection.createStatement();
! 			java.sql.ResultSet rs = stmt.executeQuery(queryString);
  			String [] title = getColumnNames(rs.getMetaData());
  			java.util.ArrayList ar = new java.util.ArrayList();
***************
*** 118,138 ****
    protected String prepareInfo() {
      StringBuffer stb = new StringBuffer( "JDBC Driver Informations\n" );
!     DatabaseMetaData dbmd = this.connection.getMetaData();
!     stb.append( "Product Name: " + dbmd.getDatabaseProductName() + "\n" );
!     stb.append( "Product Version: " + dbmd.getDatabaseProductVersion() + "\n" );
!     stb.append( "Driver Version: " + dbmd.getMajorVersion() + "." + dbmd.getMinorVersion() + "\n" );
!     stb.append( "Driver Name: " + dbmd.getDriverName() + "\n" );
!     stb.append( "URL: " + dbmd.getURL() + "\n" );
!     stb.append( "User Name: " + dbmd.getUserName() + "\n" );
!     stb.append( "Schemas:\n---------\n " );
!     ResultSet sches = dbmd.getSchemas();
!     while(cats.next()) {
!       stb.append( sches.getString(1) + "\n" );
!     }
!     stb.append( "Catalogs:\n---------\n " );
!     ResultSet cats = dbmd.getCatalogs();
!     while(cats.next()) {
!       stb.append( cats.getString(1) + "\n" );
!     }
      return stb.toString();
    }
--- 127,152 ----
    protected String prepareInfo() {
      StringBuffer stb = new StringBuffer( "JDBC Driver Informations\n" );
!     try {
!       DatabaseMetaData dbmd = this.connection.getMetaData();
!       stb.append( "Product Name: " + dbmd.getDatabaseProductName() + "\n" );
!       stb.append( "Product Version: " + dbmd.getDatabaseProductVersion() + "\n" );
!       // stb.append( "Driver Version: " + dbmd.getMajorVersion() + "." + dbmd.getMinorVersion() + "\n" );
!       stb.append( "Driver Name: " + dbmd.getDriverName() + "\n" );
!       stb.append( "URL: " + dbmd.getURL() + "\n" );
!       stb.append( "User Name: " + dbmd.getUserName() + "\n" );
!       stb.append( "Schemas:\n---------\n " );
!       ResultSet sches = dbmd.getSchemas();
!       while(sches.next()) {
!         stb.append( sches.getString(1) + "\n" );
!       }
!       stb.append( "Catalogs:\n---------\n " );
!       ResultSet cats = dbmd.getCatalogs();
!       while(cats.next()) {
!         stb.append( cats.getString(1) + "\n" );
!       }
!     } catch ( SQLException sqle ) {
!       stb.append( sqle.toString() );
!     } // end of try-catch
!     
      return stb.toString();
    }