From e2e3b81f323957495a643a9087b663df03dac2d9 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 20 Oct 2016 16:13:06 -0700
Subject: more pdo tweaks

---
 include/dba/dba_pdo.php | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

(limited to 'include/dba/dba_pdo.php')

diff --git a/include/dba/dba_pdo.php b/include/dba/dba_pdo.php
index b3a1209bc..bb89df6be 100755
--- a/include/dba/dba_pdo.php
+++ b/include/dba/dba_pdo.php
@@ -14,7 +14,7 @@ class dba_pdo extends dba_driver {
 		. ':host=' . $server . (is_null($port) ? '' : ';port=' . $port)
 		. ';dbname=' . $db;
 
-		db_logger('dns: ' . $dns);
+		// db_logger('dns: ' . $dns);
 
 		try {
 			$this->db = new PDO($dns,$user,$pass);
@@ -40,8 +40,11 @@ class dba_pdo extends dba_driver {
 		if((! $this->db) || (! $this->connected))
 			return false;
 
-		if($this->driver_dbtype === 'pgsql' && (!  strpos($sql,';')))
-			$sql .= ';';
+		if($this->driver_dbtype === 'pgsql') {
+			if(substr(rtrim($sql),-1,1) !== ';') {
+				$sql .= ';';
+			}
+		}
 
 		$this->error = '';
 		$select = ((stripos($sql,'select') === 0) ? true : false);
@@ -113,6 +116,24 @@ class dba_pdo extends dba_driver {
 		}
 	}
 
+	function escapebin($str) {
+		if($this->driver_dbtype === 'pgsql') {
+			return str_replace([ chr(92), chr(0), chr(39) ], [ '\\\134', '\\\000', '\\\047' ], $str);
+		}
+		else {
+			return $this->escape($str);
+		}
+	}
+	
+	function unescapebin($str) {
+		if($this->driver_dbtype === 'pgsql') {
+			return stripcslashes($str);
+		}
+		else {
+			return $str;
+		}
+	}
+
 
 	function getdriver() {
 		return 'pdo';
-- 
cgit v1.2.3