diff options
| -rw-r--r-- | adodb-csvlib.inc.php | 1 | ||||
| -rw-r--r-- | drivers/adodb-postgres64.inc.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/adodb-csvlib.inc.php b/adodb-csvlib.inc.php index 9b7f851b..87efd940 100644 --- a/adodb-csvlib.inc.php +++ b/adodb-csvlib.inc.php @@ -80,7 +80,6 @@ $ADODB_INCLUDED_CSV = 1; $rs2 = new $class(ADORecordSet::DUMMY_QUERY_ID); $rs2->timeCreated = $rs->timeCreated; # memcache fix $rs2->sql = $rs->sql; - $rs2->oldProvider = $rs->dataProvider; $rs2->InitArrayFields($rows,$flds); $rs2->fetchMode = $savefetch; return $line.serialize($rs2); diff --git a/drivers/adodb-postgres64.inc.php b/drivers/adodb-postgres64.inc.php index 9becaf4e..a198423d 100644 --- a/drivers/adodb-postgres64.inc.php +++ b/drivers/adodb-postgres64.inc.php @@ -272,7 +272,9 @@ class ADODB_postgres64 extends ADOConnection{ if ($this->_connectionID) { return "'" . pg_escape_string($this->_connectionID, $s) . "'"; } else { - return "'" . pg_escape_string($s) . "'"; + // Fall back to emulated escaping when there is no database connection. + // Avoids errors when using setSessionVariables() in the load balancer. + return parent::qStr( $s ); } } |