Changeset 800

Timestamp:

03/07/07 20:55:19 (2 years ago)

Author:

mfenniak

Message:

Make execute functions work with non-queries (insert, create, so on)

Files:

• pg8000/trunk/pg8000.py (modified) (8 diffs)
• pg8000/trunk/pg8000-test.py (modified) (1 diff)

pg8000/trunk/pg8000.py

@@ -87 +87 @@
-    # A configuration variable that determines whether iterating over the
-    # connection will return tuples of queried rows (False), or dictionaries
-is set to
-Fals
+value is
+copied from the connection's iterate_dicts valu
-    # <p>
-    # Stability: Added in v1.00, stability guaranteed for v1.xx.
@@ -96 +96 @@
-
-    def __init__(self, connection, name = None):
+        self.iterate_dicts = connection.iterate_dicts
-        self.c = connection.c
-        if name == None:
@@ -108 +109 @@
-        self._command_complete = False
-        self._row_desc = self.c.extended_query(self.name, '', query, args)
+        if self._row_desc == None:
+            self._command_complete = True
-
-    def _fetch(self):
@@ -117 +120 @@
-            if end_of_data:
-                self._command_complete = True
+                if not rows:
+                    # special case - an empty query, hit end_of_data and no
+                    # rows at the same time
+                    return None
-        row = self._cached_rows[0]
-        del self._cached_rows[0]
@@ -188 +195 @@
-# authentication, then the password will not be used.
-class Connection(object):
+
+    ##
+    # A configuration variable that determines whether iterating over the
+    # connection will return tuples of queried rows (False), or dictionaries
+    # indexed by column name/alias (True).  By default, this variable is set to
+    # False.
+    # <p>
+    # Stability: Added in v1.00, stability guaranteed for v1.xx.
+    iterate_dicts = False
+
-    def __init__(self, host, user, port=5432, database=None, password=None):
-        self._row_desc = None
@@ -416 +433 @@
-        createFromData = staticmethod(createFromData)
-
+    class NoData(object):
+        def createFromData(data):
+            return Protocol.NoData()
+        createFromData = staticmethod(createFromData)
+
-    class ParseComplete(object):
-        def createFromData(data):
@@ -582 +604 @@
-                    # good news everybody!
-                    pass
+                elif isinstance(msg, Protocol.NoData):
+                    # no data means we should execute this command right away
+                    self._send(Protocol.Execute(portal, 0))
+                    self._send(Protocol.Sync())
+                    while 1:
+                        msg = self._read_message()
+                        if isinstance(msg, Protocol.CommandComplete):
+                            # more good news!
+                            pass
+                        elif isinstance(msg, Protocol.ReadyForQuery):
+                            # ready to move on with life...
+                            return None
+                        elif isinstance(msg, Protocol.ErrorResponse):
+                            raise msg.createException()
+                        else:
+                            raise InternalError("unexpected response")
-                elif isinstance(msg, Protocol.RowDescription):
-                    return msg
@@ -649 +687 @@
-        "3": CloseComplete,
-        "s": PortalSuspended,
+        "n": NoData,
-        }
-

pg8000/trunk/pg8000-test.py

@@ -4 +4 @@
-
-db = pg8000.Connection(host='localhost', user='mfenniak')
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-print "begin query..."
-sor.execute("SELECT township, range, meridian FROM ats LIMIT 176
+1.execute("SELECT * FROM t1
-i = 0
- in cursor
+1 in cur1
-    i = i + 1
-
+
+
+
+
-print "end query..."
-
-print "begin query..."
-sor.execute("SELECT 5000 + 1, True as pg_stuff, False, '2000-01-02 03:04:05.67'::timestamp, $1", 55
-sor
+1.execute("SELECT 5000 + 1 as int_test, True as bool_test, '2000-01-02 03:04:05.67'::timestamp as timestamp_test"
+1
-    print repr(row)
-print "end query..."