From: Ole B. Rosentreter <ole@laktatnebel.de>
Date: Sun, 13 Oct 2024 19:24:24 +0000 (+0200)
Subject: DB-Lib erweitert
X-Git-Url: https://git.laktatnebel.de/?a=commitdiff_plain;h=68ee0ba03284ead0bd57d29651cfdfc789b694c8;p=ticket.git

DB-Lib erweitert
---

diff --git a/ticket-web/src/webui/lib/db/database_functions_pgsql.php b/ticket-web/src/webui/lib/db/database_functions_pgsql.php
index dd95202..9d584c7 100644
--- a/ticket-web/src/webui/lib/db/database_functions_pgsql.php
+++ b/ticket-web/src/webui/lib/db/database_functions_pgsql.php
@@ -4,12 +4,9 @@
  * Mit PostgresSQL verbinden */
 function getDBConnection() {
 
-    //$dbConnection = new PgSql\Connection();
-    
-	$str_connection = "host=".HOST." dbname=".DB." user=".USER." password=".PASS;
+	$str_connection = "host=".HOST." port=5432 dbname=".DB." user=".USER." password=".PASS." ";
 	// mit DB verbinden
-	//$dbConnection->pg_pconnect($str_connection) or die('Verbindungsaufbau fehlgeschlagen: ');
-	$connect_dbms_handle = @pg_pconnect($str_connection) or die('Verbindungsaufbau fehlgeschlagen: ');
+	$connect_dbms_handle = @pg_connect($str_connection) or die('Verbindungsaufbau fehlgeschlagen: ' . pg_last_error());
 
 	if ($connect_dbms_handle) {
 		return $connect_dbms_handle;
@@ -22,8 +19,9 @@ function getDBConnection() {
 
 /**
  * PostgresSQL-Verbindung schliessen */
-function closeDBConnection($dbms_connection) {
-    @pg_close($dbms_connection) or die('Verbindungsclose fehlgeschlagen: ');
+function closeDBConnection($ref_connection) {
+	@pg_close($ref_connection) or die('Verbindungsclose fehlgeschlagen: ');
+	echo pg_last_error($ref_connection);
 }
 
 
@@ -35,7 +33,7 @@ function getBooleanData ($dbms_connection, $db_query) {
 	$return_bool_value = false ;
 
 	// DB Abfage starten
-	//echo "<p>".$db_query."</p>";
+	//echo $db_query;
 	$res_sql_result = pg_query ($dbms_connection, $db_query);
 	// Gültigkeit der DB Abfage testen
 	if ($res_sql_result) {
@@ -53,50 +51,25 @@ function getBooleanData ($dbms_connection, $db_query) {
 // Parameter: Tablle, Feld(er), Wert(e)
 // Rückgabewert: Array
 function getData ($dbms_connection, $db_query) {
-    $return_arr_data = array();		 // Rückgabewert als Array
-    //echo "\n<p> SQL:<br>".$ref_str_db_query."</p>";
-    
-    // DB Abfage starten
-    //echo $db_query;
-    $res_sql_result = pg_query ($dbms_connection, $db_query);
-    
-    // Gültigkeit der DB Abfage testen
-    if ($res_sql_result) {
-        while ($arr_sql_data = pg_fetch_row($res_sql_result)) {
-            //print_r($arr_sql_data);
-            array_push ($return_arr_data, $arr_sql_data);
-        }
-        //var_dump( $return_arr_data);
-    } else {
-        return "Datenbankabfrage fehlgeschlagen!";
-    }
-    
-    return $return_arr_data;
-}
+	$return_arr_data = array();		 // Rückgabewert als Array
+	//echo "\n<p> SQL:<br>".$ref_str_db_query."</p>";
 
-// SQL an DB absetzen
-// Parameter: Tablle, Feld(er), Wert(e)
-// Rückgabewert: Array
-function getDataReturnID ($dbms_connection, $db_query) {
-    $return_arr_data = array();		 // Rückgabewert als Array
-    //echo "\n<p> SQL:<br>".$ref_str_db_query."</p>";
-    
-    // DB Abfage starten
-    //echo $db_query;
-    $res_sql_result = pg_query ($dbms_connection, $db_query);
-    
-    // Gültigkeit der DB Abfage testen
-    if ($res_sql_result) {
-        while ($arr_sql_data = pg_fetch_row($res_sql_result)) {
-            //print_r($arr_sql_data);
-            array_push ($return_arr_data, $arr_sql_data);
-        }
-        //var_dump( $return_arr_data);
-    } else {
-        return "Datenbankabfrage fehlgeschlagen!";
-    }
-    
-    return $return_arr_data[0][0];
+	// DB Abfage starten
+	//echo $db_query;
+	$res_sql_result = pg_query ($dbms_connection, $db_query);
+	// Gültigkeit der DB Abfage testen
+	if ($res_sql_result) {
+		//echo "<p>".$res_sql_result."</p>";
+		while ($arr_sql_data = pg_fetch_row($res_sql_result)) {
+			//echo debugPrint($arr_sql_data);
+			array_push ($return_arr_data, $arr_sql_data);
+		}
+		//var_dump( $return_arr_data);
+	} else {
+		return "Datenbankabfrage fehlgeschlagen!";
+	}
+
+	return $return_arr_data;
 }
 
 
diff --git a/ticket-web/src/webui/lib/db/database_functions_select.php b/ticket-web/src/webui/lib/db/database_functions_select.php
index 3a24606..2f65c46 100644
--- a/ticket-web/src/webui/lib/db/database_functions_select.php
+++ b/ticket-web/src/webui/lib/db/database_functions_select.php
@@ -1,19 +1,46 @@
 <?php
+function generateSelect ($selectedFields, $table) {
+	$select_str = "SELECT ";
+	
+	if (is_array($selectedFields)) {
+		//print_r($selectedFields);
+    	$anzFields = count($selectedFields);
+    	for ($i = 0 ; $i < $anzFields; $i++) {
+    		$select_str .= $selectedFields[$i];
+    		if ($i < $anzFields-1) {
+    			$select_str .= ", ";
+    		}
+    	}
+	} else {
+	    $select_str .= "*";
+	}
+	
+	$select_str .= " FROM ".SCHEMA.".".$table;
+	
+	$select_str .= ";";
+
+	//echo $select_str;
+	return $select_str;
+}
 
 
-function generateSelect ($selectedFields, $table, $whereClause, $orderClause) {
+function generateSelectWhereOrder ($selectedFields, $table, $whereClause, $orderClause) {
 	$select_str = "SELECT ";
 
-	//print_r($selectedFields);
-	$anzFields = count($selectedFields);
-	for ($i = 0 ; $i < $anzFields; $i++) {
-		$select_str .= $selectedFields[$i];
-		if ($i < $anzFields-1) {
-			$select_str .= ", ";
-		}
+	if (is_array($selectedFields)) {
+	    //print_r($selectedFields);
+    	$anzFields = count($selectedFields);
+    	for ($i = 0 ; $i < $anzFields; $i++) {
+    		$select_str .= $selectedFields[$i];
+    		if ($i < $anzFields-1) {
+    			$select_str .= ", ";
+    		}
+    	}
+	} else {
+	    $select_str .= "*";
 	}
 
-	$select_str .= " FROM ".$table;
+	$select_str .= " FROM ".SCHEMA.".".$table;
 
 	if ($whereClause != null) {
 		$select_str .= " WHERE ";
@@ -42,7 +69,8 @@ function generateSelect ($selectedFields, $table, $whereClause, $orderClause) {
 	}
 
 	$select_str .= ";";
-	//echo ($select_str);
+
+	//echo $select_str;
 	return $select_str;
 }