Potential Close ADOdb#978

NathanGibbs3 · Jun 9, 2023 · bd3885c · bd3885c
1 parent d4f9f45
commit bd3885c
Showing 1 changed file with 20 additions and 5 deletions.
diff --git a/drivers/adodb-postgres8.inc.php b/drivers/adodb-postgres8.inc.php
@@ -45,11 +45,26 @@ class ADODB_postgres8 extends ADODB_postgres7
 	 * @return int last inserted ID for given table/column, or the most recently
 	 *             returned one if $table or $column are empty
 	 */
-	protected function _insertID($table = '', $column = '')
-	{
-		return empty($table) || empty($column)
-			? $this->GetOne("SELECT lastval()")
-			: $this->GetOne("SELECT currval(pg_get_serial_sequence('$table', '$column'))");
+	protected function _insertID( $table = '', $column = '' ){
+		$Ret = false;
+		$tmpsql = 'SELECT ';
+		if( empty($table) || empty($column) ){
+			$tmpsql .= 'lastval()';
+		}else{
+			$tmpsql .= "currval(pg_get_serial_sequence('$table', '$column'))";
+		}
+		$result = @$this->GetOne($tmpsql);
+		if( $result === false || $result == $ADODB_GETONE_EOF ){
+			$Ret = false;
+			if( $this->debug ){
+				ADOConnection::outp(
+					__FUNCTION__"() failed : "  . $this->errorMsg()
+				);
+			}
+		}else{
+			$Ret = $result;
+		}
+		return $Ret;
 	}
 }