Merge branch '4.2RC'4.2

2 files changed, 26 insertions, 1 deletions

diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index ee0e06a91..cfb208e2d 100755
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -485,3 +485,28 @@ function db_columns($table) {
 
 	return [];
 }
+
+
+function db_indexes($table) {
+
+	if($table) {
+		if(ACTIVE_DBTYPE === DBTYPE_POSTGRES) {
+			$r = q("SELECT indexname from pg_indexes where tablename = '%s'",
+				dbesc($table)
+			);
+			if($r) {
+				return ids_to_array($r,'indexname');
+			}
+		}
+		else {
+			$r = q("show index from %s",
+				dbesc($table)
+			);
+			if($r) {
+				return ids_to_array($r,'Key_name');
+			}
+		}
+	}
+
+	return [];
+}
diff --git a/include/dba/dba_pdo.php b/include/dba/dba_pdo.php
index ef8063428..0279342ec 100755
--- a/include/dba/dba_pdo.php
+++ b/include/dba/dba_pdo.php
@@ -19,7 +19,7 @@ class dba_pdo extends dba_driver {
 		$this->driver_dbtype = $scheme;
 
 		if(strpbrk($server,':;')) {
-			$dsn = $server;
+			$dsn = $this->driver_dbtype . ':unix_socket=' . trim($server, ':;');
 		}
 		else {
 			$dsn = $this->driver_dbtype . ':host=' . $server . (intval($port) ? ';port=' . $port : '');