[Phpeclipse-commits] net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql SQLHelper.java,1.1,1.2 SQLParser.java,1.1,1.2 MultiSQLServer.java,1.2,1.3

[Klaus H. <kha...@us...>]

Update of /cvsroot/phpeclipse/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22514/src/com/quantum/sql

Modified Files:
	SQLHelper.java SQLParser.java MultiSQLServer.java 
Log Message:
latest quantum sources 2.3.2

Index: MultiSQLServer.java
===================================================================
RCS file: /cvsroot/phpeclipse/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/MultiSQLServer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MultiSQLServer.java	8 Jun 2004 19:53:14 -0000	1.2
--- MultiSQLServer.java	25 Jun 2004 18:16:44 -0000	1.3
***************
*** 88,107 ****
      }
  
-     public Vector getSchemas(Connection con) {
-         ResultSet set;
-         Vector schemaList = new Vector();
-         try {
-             DatabaseMetaData meta = con.getMetaData();
-             set = meta.getSchemas();
-             while (set.next()) {
-                 schemaList.add(set.getString("TABLE_SCHEM")); //$NON-NLS-1$
-             }
-             set.close();
-         } catch (SQLException e) {
-             LogProxy log = LogProxy.getInstance();
-             log.addText(LogProxy.ERROR, e);
-         }
-         return schemaList;
-     }
      /**
       * Makes a connection to a JDBC driver based on the data from a bookmark
--- 88,91 ----
***************
*** 123,137 ****
              }
          }
! 		Connection con;
          if (password != null) {
!             con = connect(bookmark, password);
          } else {
              return null;
          }
-         // Set the autoCommit state of the bookmark to the default on new connections
-  		bookmark.setAutoCommit(bookmark.getDefaultAutoCommit());
-  		// Set the autoCommit state of the JDBC connection to the bookmark autoCommit statec
-        	setAutoCommit(con, bookmark.isAutoCommit());
-        	return con;
          
      }
--- 107,123 ----
              }
          }
!         
          if (password != null) {
!             Connection connection = connect(bookmark, password);
!             if (connection != null) {
! 		        // Set the autoCommit state of the bookmark to the default on new connections
! 		 		bookmark.setAutoCommit(bookmark.getDefaultAutoCommit());
! 		 		// Set the autoCommit state of the JDBC connection to the bookmark autoCommit statec
! 		       	setAutoCommit(connection, bookmark.isAutoCommit());
!             }
! 	       	return connection;
          } else {
              return null;
          }
          
      }

Index: SQLParser.java
===================================================================
RCS file: /cvsroot/phpeclipse/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/SQLParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SQLParser.java	16 Apr 2004 19:15:48 -0000	1.1
--- SQLParser.java	25 Jun 2004 18:16:44 -0000	1.2
***************
*** 54,58 ****
  			e.printStackTrace();
  		}
- 		System.out.println("Returning"); //$NON-NLS-1$
  		Vector result = new Vector();
  		result.addAll(groups);
--- 54,57 ----

Index: SQLHelper.java
===================================================================
RCS file: /cvsroot/phpeclipse/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/sql/SQLHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SQLHelper.java	16 Apr 2004 19:15:48 -0000	1.1
--- SQLHelper.java	25 Jun 2004 18:16:42 -0000	1.2
***************
*** 3,7 ****
  import java.sql.Connection;
  import java.sql.SQLException;
- import java.util.Vector;
  
  import com.quantum.adapters.DatabaseAdapter;
--- 3,6 ----
***************
*** 10,16 ****
  public class SQLHelper {
  	
- 	public static Vector getSchemas(Connection connection) {
- 		return MultiSQLServer.getInstance().getSchemas(connection);
- 	}
      public static int getSize(Connection connection, String tableName, DatabaseAdapter adapter) throws SQLException {
          SQLResults results = MultiSQLServer.getInstance().execute( 
--- 9,12 ----