Changeset 838

Timestamp:

03/12/07 20:34:49 (1 year ago)

Author:

mfenniak

Message:

Add some checks to DBAPI methods.

Files:

• pg8000/trunk/pg8000.py (modified) (8 diffs)

pg8000/trunk/pg8000.py

@@ -85 +85 @@
-    Error = Error
-    InterfaceError = InterfaceError
+    InternalError = InternalError
-    DatabaseError = DatabaseError
-    DataError = DataError
@@ -273 +274 @@
-            self.arraysize = 1
-
+        rowcount = property(lambda self: self._getRowCount())
+        def _getRowCount(self):
+            return -1
+
+        description = property(lambda self: self._getDescription())
+        def _getDescription(self):
+            return None
+
-        def execute(self, operation, args=()):
+            if self.cursor == None:
+                raise InterfaceError("cursor is closed")
-            new_query, new_args = DBAPI.convert_paramstyle(DBAPI.paramstyle, operation, args)
-            self.cursor.execute(new_query, *new_args)
@@ -282 +293 @@
-
-        def fetchone(self):
+            if self.cursor == None:
+                raise InterfaceError("cursor is closed")
-            return self.cursor.read_tuple()
-
@@ -293 +306 @@
-
-        def fetchall(self):
+            if self.cursor == None:
+                raise InterfaceError("cursor is closed")
-            return tuple(self.cursor.iterate_tuple())
-
@@ -321 +336 @@
-            # statements on other threads.  Support for that type of lock will
-            # be done later.
+            if self.conn == None:
+                raise InterfaceError("connection is closed")
-            self.conn.commit()
-            self.conn.begin()
@@ -326 +343 @@
-        def rollback(self):
-            # see bug description in commit.
+            if self.conn == None:
+                raise InterfaceError("connection is closed")
-            self.conn.rollback()
-            self.conn.begin()
@@ -1452 +1471 @@
-    py_types = {
-        int: {"tid": 1700, "txt_out": numeric_out},
+        long: {"tid": 1700, "txt_out": numeric_out},
-        str: {"tid": 25, "txt_out": textout},
-        unicode: {"tid": 25, "txt_out": textout},
@@ -1466 +1486 @@
-        23: {"txt_in": int4in, "bin_in": int4recv, "prefer": "bin"},
-        25: {"txt_in": varcharin}, # TEXT type
+        26: {"txt_in": numeric_in}, # oid type
-        700: {"txt_in": float4in, "bin_in": float4recv, "prefer": "bin"},
-        701: {"txt_in": float8in, "bin_in": float8recv, "prefer": "bin"},