diff --git a/postgresql/driver/pq3.py b/postgresql/driver/pq3.py index 40314c0b..0adfba88 100644 --- a/postgresql/driver/pq3.py +++ b/postgresql/driver/pq3.py @@ -1487,7 +1487,7 @@ def _init(self): if self.string is not None: q = self.database.typio._encode(str(self.string))[0] cmd = [ - element.CloseStatement(self._pq_statement_id), + #element.CloseStatement(self._pq_statement_id), element.Parse(self._pq_statement_id, q, ()), ] else: @@ -1869,12 +1869,12 @@ def __call__(self, *args, **kw): if self.srf is True: if self.composite is True: - return self.statement.rows(*input) + return self.statement(*input) else: # A generator expression is very appropriate here # as SRFs returning large number of rows would require # substantial amounts of memory. - return map(get0, self.statement.rows(*input)) + return list(map(get0, self.statement(*input))) else: if self.composite is True: return self.statement(*input)[0] diff --git a/postgresql/project.py b/postgresql/project.py index aec21dab..7b5c26da 100644 --- a/postgresql/project.py +++ b/postgresql/project.py @@ -10,5 +10,5 @@ contact = 'python-general@pgfoundry.org' abstract = 'Driver and tools library for PostgreSQL' -version_info = (1, 1, 0) +version_info = (1, 1, 2, 'pgpool') version = '.'.join(map(str, version_info)) diff --git a/postgresql/protocol/client3.py b/postgresql/protocol/client3.py index daba076f..bafe7020 100644 --- a/postgresql/protocol/client3.py +++ b/postgresql/protocol/client3.py @@ -361,7 +361,7 @@ def take_out_trash(self): xm = [] cursors = 0 for x in self.garbage_cursors: - xm.append(element.ClosePortal(x)) + #xm.append(element.ClosePortal(x)) cursors += 1 statements = 0 for x in self.garbage_statements: