[Jython-checkins] CVS: jython/Lib dbexts.py,1.1,1.2

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

Update of /cvsroot/jython/jython/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv30489/Lib

Modified Files:
	dbexts.py 
Log Message:
api cleanup

Index: dbexts.py
===================================================================
RCS file: /cvsroot/jython/jython/Lib/dbexts.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dbexts.py	2001/11/20 04:55:18	1.1
--- dbexts.py	2001/12/07 04:03:51	1.2
***************
*** 180,184 ****
  		self.formatter = formatter
  		self.out = out
- 		self.metaDataCase = lambda x: x
  
  		if not jndiname:
--- 180,183 ----
***************
*** 203,209 ****
  					except:
  						pass
! 				if t.has_key("metaDataCase"):
! 					self.metaDataCase = getattr(string, t['metaDataCase'])
! 				keys = filter(lambda x: x not in ['url', 'user', 'pwd', 'driver', 'datahandler', 'name', 'metaDataCase'], t.keys())
  				props = {}
  				for a in keys:
--- 202,206 ----
  					except:
  						pass
! 				keys = filter(lambda x: x not in ['url', 'user', 'pwd', 'driver', 'datahandler', 'name'], t.keys())
  				props = {}
  				for a in keys:
***************
*** 323,327 ****
  		""" display the table's primary keys """
  		cur = self.begin()
! 		cur.primarykeys(schema, owner, self.metaDataCase(table))
  		self.commit(cur)
  		self.display()
--- 320,324 ----
  		""" display the table's primary keys """
  		cur = self.begin()
! 		cur.primarykeys(schema, owner, table)
  		self.commit(cur)
  		self.display()
***************
*** 331,339 ****
  		cur = self.begin()
  		if primary_table and foreign_table:
! 			cur.foreignkeys(schema, owner, self.metaDataCase(primary_table), schema, owner, self.metaDataCase(foreign_table))
  		elif primary_table:
! 			cur.foreignkeys(schema, owner, self.metaDataCase(primary_table), schema, owner, None)
  		elif foreign_table:
! 			cur.foreignkeys(schema, owner, None, schema, owner, self.metaDataCase(foreign_table))
  		self.commit(cur)
  		self.display()
--- 328,336 ----
  		cur = self.begin()
  		if primary_table and foreign_table:
! 			cur.foreignkeys(schema, owner, primary_table, schema, owner, foreign_table)
  		elif primary_table:
! 			cur.foreignkeys(schema, owner, primary_table, schema, owner, None)
  		elif foreign_table:
! 			cur.foreignkeys(schema, owner, None, schema, owner, foreign_table)
  		self.commit(cur)
  		self.display()
***************
*** 344,348 ****
  		cur = self.begin()
  		if table:
! 			cur.columns(schema, owner, self.metaDataCase(table), None)
  		else:
  			cur.tables(schema, owner, None, types)
--- 341,345 ----
  		cur = self.begin()
  		if table:
! 			cur.columns(schema, owner, table, None)
  		else:
  			cur.tables(schema, owner, None, types)
***************
*** 364,368 ****
  		""" display the table's indicies """
  		cur = self.begin()
! 		cur.statistics(qualifier, owner, self.metaDataCase(table), unique, accuracy)
  		self.commit(cur)
  		self.display()
--- 361,365 ----
  		""" display the table's indicies """
  		cur = self.begin()
! 		cur.statistics(qualifier, owner, table, unique, accuracy)
  		self.commit(cur)
  		self.display()