From 88d0c643553f55ca3286bc90e5d8e7d6aba02628 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Sat, 26 Jan 2008 22:50:15 +0000
Subject: [PATCH] #1236 ne pas prefixer les noms de bases qui commencent
malencontreusement par spip_ (requete CREATE DATABASE spip_truc)
---
ecrire/req/mysql.php | 2 +-
ecrire/req/pg.php | 2 +-
ecrire/req/sqlite_generique.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ecrire/req/mysql.php b/ecrire/req/mysql.php
index d0376cb72e..fea1a59904 100644
--- a/ecrire/req/mysql.php
+++ b/ecrire/req/mysql.php
@@ -267,7 +267,7 @@ function traite_query($query, $db='', $prefixe='') {
if ($prefixe)
$pref .= $prefixe . "_";
- if (preg_match('/\s(SET|VALUES|WHERE)\s/i', $query, $regs)) {
+ if (preg_match('/\s(SET|VALUES|WHERE|DATABASE)\s/i', $query, $regs)) {
$suite = strstr($query, $regs[0]);
$query = substr($query, 0, -strlen($suite));
} else $suite ='';
diff --git a/ecrire/req/pg.php b/ecrire/req/pg.php
index 2a7b2a73bc..dc3bb8c822 100644
--- a/ecrire/req/pg.php
+++ b/ecrire/req/pg.php
@@ -124,7 +124,7 @@ function spip_pg_query($query, $serveur='')
$link = $connexion['link'];
$db = $connexion['db'];
- if (preg_match('/\s(SET|VALUES|WHERE)\s/i', $query, $regs)) {
+ if (preg_match('/\s(SET|VALUES|WHERE|DATABASE)\s/i', $query, $regs)) {
$suite = strstr($query, $regs[0]);
$query = substr($query, 0, -strlen($suite));
} else $suite ='';
diff --git a/ecrire/req/sqlite_generique.php b/ecrire/req/sqlite_generique.php
index ff00b59519..8a7f2ee883 100644
--- a/ecrire/req/sqlite_generique.php
+++ b/ecrire/req/sqlite_generique.php
@@ -1310,7 +1310,7 @@ class sqlite_traiter_requete{
// Correction des noms de tables FROM
// mettre les bons noms de table dans from, update, insert, replace...
- if (preg_match('/\s(SET|VALUES|WHERE)\s/i', $this->query, $regs)) {
+ if (preg_match('/\s(SET|VALUES|WHERE|DATABASE)\s/i', $this->query, $regs)) {
$suite = strstr($this->query, $regs[0]);
$this->query = substr($this->query, 0, -strlen($suite));
} else $suite ='';
--
GitLab