[Jython-checkins] CVS: jython/com/ziclix/python/sql PyCursor.java,1.11,1.12

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

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

Modified Files:
	PyCursor.java 
Log Message:
changed rowid to lastrowid per the spec

Index: PyCursor.java
===================================================================
RCS file: /cvsroot/jython/jython/com/ziclix/python/sql/PyCursor.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PyCursor.java	2001/12/29 07:16:20	1.11
--- PyCursor.java	2001/12/29 18:00:14	1.12
***************
*** 37,41 ****
  
  	/** Field warnings */
! 	protected PyObject rowid;
  
  	/** Field updatecount */
--- 37,41 ----
  
  	/** Field warnings */
! 	protected PyObject lastrowid;
  
  	/** Field updatecount */
***************
*** 124,128 ****
  		m[3] = new PyString("datahandler");
  		m[4] = new PyString("warnings");
! 		m[5] = new PyString("rowid");
  		m[6] = new PyString("updatecount");
  		__members__ = new PyList(m);
--- 124,128 ----
  		m[3] = new PyString("datahandler");
  		m[4] = new PyString("warnings");
! 		m[5] = new PyString("lastrowid");
  		m[6] = new PyString("updatecount");
  		__members__ = new PyList(m);
***************
*** 175,180 ****
  		} else if ("warnings".equals(name)) {
  			return warnings;
! 		} else if ("rowid".equals(name)) {
! 			return rowid;
  		} else if ("updatecount".equals(name)) {
  			return updatecount;
--- 175,180 ----
  		} else if ("warnings".equals(name)) {
  			return warnings;
! 		} else if ("lastrowid".equals(name)) {
! 			return lastrowid;
  		} else if ("updatecount".equals(name)) {
  			return updatecount;
***************
*** 473,477 ****
  	/**
  	 * Execute the current sql statement.  Some generic functionality such
! 	 * as updating the rowid and updatecount occur as well.
  	 *
  	 * @param ExecuteSQL execute
--- 473,477 ----
  	/**
  	 * Execute the current sql statement.  Some generic functionality such
! 	 * as updating the lastrowid and updatecount occur as well.
  	 *
  	 * @param ExecuteSQL execute
***************
*** 487,491 ****
  		execute.executeSQL();
  
! 		this.rowid = this.datahandler.getRowId(this.sqlStatement);
  		this.updatecount = Py.newInteger(this.sqlStatement.getUpdateCount());
  
--- 487,491 ----
  		execute.executeSQL();
  
! 		this.lastrowid = this.datahandler.getRowId(this.sqlStatement);
  		this.updatecount = Py.newInteger(this.sqlStatement.getUpdateCount());
  
***************
*** 657,661 ****
  
  		this.warnings = Py.None;
! 		this.rowid = Py.None;
  		this.updatecount = Py.newInteger(-1);
  
--- 657,661 ----
  
  		this.warnings = Py.None;
! 		this.lastrowid = Py.None;
  		this.updatecount = Py.newInteger(-1);