attempt at a simpler version

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

Author: come-nc

lib/private/DB/AdapterOCI8.php

@@ -28,11 +28,13 @@ public function fixupStatement($statement) {
 		$statement = str_ireplace('UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement);
 
 		$statement = preg_replace(
-			'/^INSERT INTO (".*")( ?\(.*) ?VALUES( ?\(.*)$/',
-			'DECLARE vRowid ROWID; BEGIN INSERT INTO ${1} VALUES ${2}; RETURNING ROWID INTO vRowid dbms_output.put_line(vRowid); END;',
+			'/^INSERT (INTO .+ VALUES \(.+\))$/',
+			'INSERT ${1} RETURNING ROWID INTO vRowid',
 			$statement
 		);
 
+		var_dump($statement);
+
 		return $statement;
 	}
 }

lib/private/DB/OracleConnection.php

@@ -96,9 +96,9 @@ public function tableExists($table) {
 	 *
 	 * This method supports PDO binding types as well as DBAL mapping types.
 	 *
-	 * @param string $sql  The SQL query.
-	 * @param array  $params The query parameters.
-	 * @param array  $types  The parameter types.
+	 * @param string $sql The SQL query.
+	 * @param array $params The query parameters.
+	 * @param array $types The parameter types.
 	 *
 	 * @return int The number of affected rows, if the result is bigger than PHP_INT_MAX, PHP_INT_MAX is returned
 	 *
@@ -108,7 +108,7 @@ public function executeStatement($sql, array $params = [], array $types = []): i
 		$returned = parent::executeStatement($sql, $params, $types);
 
 		var_dump($sql);
-		if (preg_match('/^DECLARE vRowid ROWID; BEGIN INSERT INTO (.*) VALUES (.*) INTO (.*)$/', $sql, $matches)) {
+		if (preg_match('/INSERT INTO ([^ ]+) VALUES .* RETURNING ROWID INTO vRowid$/', $sql, $matches)) {
 			var_dump($returned);
 			$this->lastInsertId[$matches[1]] = $returned;
 			var_dump($this->lastInsertId);