Merge branch '3.4RC'3.4

2 files changed, 28 insertions, 1 deletions

diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index b3298b673..9e9f24bb3 100755
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -460,3 +460,28 @@ function db_logger($s,$level = LOGGER_NORMAL,$syslog = LOG_INFO) {
 	\DBA::$logging = false;
 	\DBA::$dba->debug = $saved;
 }
+
+
+function db_columns($table) {
+
+	if($table) {
+		if(ACTIVE_DBTYPE === DBTYPE_POSTGRES) {
+			$r = q("SELECT column_name as field FROM information_schema.columns WHERE table_schema = 'public' AND table_name = '%s'",
+				dbesc($table)
+			); 
+			if($r) {
+				return ids_to_array($r,'field');
+			}
+		}
+		else {
+			$r = q("show columns in %s",
+				dbesc($table)
+			);
+			if($r) {
+				return ids_to_array($r,'Field');
+			}
+		}
+	}
+
+	return [];
+}
\ No newline at end of file
diff --git a/include/dba/dba_pdo.php b/include/dba/dba_pdo.php
index f24c5381a..5002f53e7 100755
--- a/include/dba/dba_pdo.php
+++ b/include/dba/dba_pdo.php
@@ -100,7 +100,9 @@ class dba_pdo extends dba_driver {
 
 		if($this->debug) {
 			db_logger('dba_pdo: DEBUG: ' . printable($sql) . ' returned ' . count($r) . ' results.', LOGGER_NORMAL, LOG_INFO);
-			db_logger('dba_pdo: ' . printable(print_r($r,true)), LOGGER_NORMAL, LOG_INFO);
+			if(intval($this->debug) > 1) {
+				db_logger('dba_pdo: ' . printable(print_r($r,true)), LOGGER_NORMAL, LOG_INFO);
+			}
 		}
 
 		return (($this->error) ? false : $r);