jython-checkins

[brian z. <bz...@us...>]

Update of /cvsroot/jython/jython/com/ziclix/python/sql
In directory usw-pr-cvs1:/tmp/cvs-serv30489/com/ziclix/python/sql

Modified Files:
	PyCursor.java 
Log Message:
api cleanup

Index: PyCursor.java
===================================================================
RCS file: /cvsroot/jython/jython/com/ziclix/python/sql/PyCursor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PyCursor.java	2001/12/07 02:56:39	1.5
--- PyCursor.java	2001/12/07 04:03:51	1.6
***************
*** 257,264 ****
  	 *
  	 * @param sqlString
  	 * @throws SQLException
  	 */
! 	protected void callableStatement(String sqlString) throws SQLException {
  		this.sqlStatement = this.connection.prepareCall(sqlString);
  	}
  
--- 257,270 ----
  	 *
  	 * @param sqlString
+ 	 * @param maxRows max number of rows to be returned
  	 * @throws SQLException
  	 */
! 	protected void callableStatement(String sqlString, PyObject maxRows) throws SQLException {
! 
  		this.sqlStatement = this.connection.prepareCall(sqlString);
+ 
+ 		if (maxRows != Py.None) {
+ 			this.sqlStatement.setMaxRows(maxRows.__int__().getValue());
+ 		}
  	}
  
***************
*** 272,284 ****
  	protected void prepareStatement(String sqlString, PyObject maxRows) throws SQLException {
  
- 		int maxrows = 0;
- 
- 		if (!maxRows.equals(Py.None)) {
- 			maxrows = ((Integer)maxRows.__tojava__(Integer.class)).intValue();
- 		}
- 
  		this.sqlStatement = this.connection.prepareStatement(sqlString);
  
! 		this.sqlStatement.setMaxRows(maxrows);
  	}
  
--- 278,286 ----
  	protected void prepareStatement(String sqlString, PyObject maxRows) throws SQLException {
  
  		this.sqlStatement = this.connection.prepareStatement(sqlString);
  
! 		if (maxRows != Py.None) {
! 			this.sqlStatement.setMaxRows(maxRows.__int__().getValue());
! 		}
  	}
  
***************
*** 294,298 ****
  	 * through the standard fetchXXX() methods.
  	 */
! 	public void callproc(String sqlString, PyObject params) {
  
  		clear();
--- 296,300 ----
  	 * through the standard fetchXXX() methods.
  	 */
! 	public void callproc(String sqlString, PyObject params, PyObject bindings, PyObject maxRows) {
  
  		clear();
***************
*** 300,305 ****
  		try {
  			if (this.connection.getMetaData().supportsStoredProcedures()) {
! 				callableStatement(sqlString);
! 				execute(params, Py.None);
  			} else {
  				throw zxJDBC.makeException(zxJDBC.NotSupportedError, zxJDBC.getString("noStoredProc"));
--- 302,307 ----
  		try {
  			if (this.connection.getMetaData().supportsStoredProcedures()) {
! 				callableStatement(sqlString, maxRows);
! 				execute(params, bindings);
  			} else {
  				throw zxJDBC.makeException(zxJDBC.NotSupportedError, zxJDBC.getString("noStoredProc"));
***************
*** 323,328 ****
  	 * Return values are not defined.
  	 */
! 	public void executemany(String sqlString, PyObject params, PyObject bindings) {
! 		execute(sqlString, params, bindings, Py.Zero);
  	}
  
--- 325,330 ----
  	 * Return values are not defined.
  	 */
! 	public void executemany(String sqlString, PyObject params, PyObject bindings, PyObject maxRows) {
! 		execute(sqlString, params, bindings, maxRows);
  	}
  
***************
*** 708,715 ****
  
  			case 0 :
! 				return cursor.fetchmany(((PyInteger)arg).getValue());
  
  			case 5 :
! 				cursor.execute((String)arg.__tojava__(String.class), Py.None, Py.None, Py.None);
  
  				return Py.None;
--- 710,717 ----
  
  			case 0 :
! 				return cursor.fetchmany(arg.__int__().getValue());
  
  			case 5 :
! 				cursor.execute(arg.__str__().toString(), Py.None, Py.None, Py.None);
  
  				return Py.None;
***************
*** 720,729 ****
  
  			case 8 :
! 				cursor.callproc((String)arg.__tojava__(String.class), Py.None);
  
  				return Py.None;
  
  			case 9 :
! 				cursor.executemany((String)arg.__tojava__(String.class), Py.None, Py.None);
  
  				return Py.None;
--- 722,731 ----
  
  			case 8 :
! 				cursor.callproc(arg.__str__().toString(), Py.None, Py.None, Py.None);
  
  				return Py.None;
  
  			case 9 :
! 				cursor.executemany(arg.__str__().toString(), Py.None, Py.None, Py.None);
  
  				return Py.None;
***************
*** 750,754 ****
  
  			case 5 :
! 				cursor.execute((String)arga.__tojava__(String.class), argb, Py.None, Py.None);
  
  				return Py.None;
--- 752,756 ----
  
  			case 5 :
! 				cursor.execute(arga.__str__().toString(), argb, Py.None, Py.None);
  
  				return Py.None;
***************
*** 758,767 ****
  
  			case 8 :
! 				cursor.callproc((String)arga.__tojava__(String.class), argb);
  
  				return Py.None;
  
  			case 9 :
! 				cursor.executemany((String)arga.__tojava__(String.class), argb, Py.None);
  
  				return Py.None;
--- 760,769 ----
  
  			case 8 :
! 				cursor.callproc(arga.__str__().toString(), argb, Py.None, Py.None);
  
  				return Py.None;
  
  			case 9 :
! 				cursor.executemany(arga.__str__().toString(), argb, Py.None, Py.None);
  
  				return Py.None;
***************
*** 789,798 ****
  
  			case 5 :
! 				cursor.execute((String)arga.__tojava__(String.class), argb, argc, Py.None);
  
  				return Py.None;
  
  			case 9 :
! 				cursor.executemany((String)arga.__tojava__(String.class), argb, argc);
  
  				return Py.None;
--- 791,805 ----
  
  			case 5 :
! 				cursor.execute(arga.__str__().toString(), argb, argc, Py.None);
! 
! 				return Py.None;
! 
! 			case 8 :
! 				cursor.callproc(arga.__str__().toString(), argb, argc, Py.None);
  
  				return Py.None;
  
  			case 9 :
! 				cursor.executemany(arga.__str__().toString(), argb, argc, Py.None);
  
  				return Py.None;
***************
*** 815,833 ****
  
  		PyCursor cursor = (PyCursor)__self__;
  
  		switch (index) {
  
  			case 5 :
! 				PyArgParser parser = new PyArgParser(args, keywords);
! 				String sql = (String)parser.arg(0).__tojava__(String.class);
! 				PyObject params = parser.kw("params", Py.None);
! 				PyObject bindings = parser.kw("bindings", Py.None);
! 				PyObject maxrows = parser.kw("maxrows", Py.None);
  
! 				params = (parser.numArg() >= 2) ? parser.arg(1) : params;
! 				bindings = (parser.numArg() >= 3) ? parser.arg(2) : bindings;
! 				maxrows = (parser.numArg() >= 4) ? parser.arg(3) : maxrows;
  
! 				cursor.execute(sql, params, bindings, maxrows);
  
  				return Py.None;
--- 822,849 ----
  
  		PyCursor cursor = (PyCursor)__self__;
+ 		PyArgParser parser = new PyArgParser(args, keywords);
+ 		String sql = parser.arg(0).__str__().toString();
+ 		PyObject params = parser.kw("params", Py.None);
+ 		PyObject bindings = parser.kw("bindings", Py.None);
+ 		PyObject maxrows = parser.kw("maxrows", Py.None);
  
+ 		params = (parser.numArg() >= 2) ? parser.arg(1) : params;
+ 		bindings = (parser.numArg() >= 3) ? parser.arg(2) : bindings;
+ 		maxrows = (parser.numArg() >= 4) ? parser.arg(3) : maxrows;
+ 
  		switch (index) {
  
  			case 5 :
! 				cursor.execute(sql, params, bindings, maxrows);
  
! 				return Py.None;
  
! 			case 8 :
! 				cursor.callproc(sql, params, bindings, maxrows);
! 
! 				return Py.None;
! 
! 			case 9 :
! 				cursor.executemany(sql, params, bindings, maxrows);
  
  				return Py.None;