From 44c8dd454ce24b8671708476688ffa1d919a16f3 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Thu, 18 Oct 2007 09:18:30 +0000
Subject: [PATCH] =?UTF-8?q?Cr=C3=A9ation=20du=20r=C3=A9pertoire=20'''ecrir?=
=?UTF-8?q?e/req'''=20r=C3=A9serv=C3=A9=20aux=20fichiers=20assurant=20les?=
=?UTF-8?q?=20portages=20de=20SPIP=20sur=20les=20diff=C3=A9rents=20serveur?=
=?UTF-8?q?s=20de=20requ=C3=AAtes=20sur=20bases=20de=20donn=C3=A9es,=20ce?=
=?UTF-8?q?=20qui=20permettra=20de=20fournir=20automatiquement=20ceux=20di?=
=?UTF-8?q?sponibles=20dans=20une=20version=20de=20SPIP.=20Les=20fichiers?=
=?UTF-8?q?=20db=5Fmysql.php=20et=20db=5Fpg.php=20y=20migrent=20sous=20le?=
=?UTF-8?q?=20nom=20respectif=20de=20mysql.php=20et=20pg.php.=20Cette=20mi?=
=?UTF-8?q?gration=20devrait=20=C3=AAtre=20transparente=20puisque=20c'est?=
=?UTF-8?q?=20spip=5Fconnect=20qui=20a=20l'exclusivit=C3=A9=20du=20chargem?=
=?UTF-8?q?ent=20de=20ce=20genre=20de=20fichiers.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitattributes | 2 +-
ecrire/base/convert_sql_utf8.php | 2 --
ecrire/inc/utils.php | 4 ++--
ecrire/{base/db_mysql.php => req/mysql.php} | 2 +-
ecrire/{base/db_pg.php => req/pg.php} | 2 +-
5 files changed, 5 insertions(+), 7 deletions(-)
rename ecrire/{base/db_mysql.php => req/mysql.php} (99%)
rename ecrire/{base/db_pg.php => req/pg.php} (99%)
diff --git a/.gitattributes b/.gitattributes
index 9007145b63..e92528e7b4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -421,7 +421,6 @@ ecrire/balise/url_.php -text
ecrire/base/admin_repair.php -text
ecrire/base/convert_sql_utf8.php -text
ecrire/base/convert_utf8.php -text
-ecrire/base/db_pg.php -text
ecrire/base/delete_all.php -text
ecrire/base/delete_statistiques.php -text
ecrire/base/import_all.php -text
@@ -701,6 +700,7 @@ ecrire/maj/v019.php -text
ecrire/maj/v019_pre193.php -text
ecrire/prive.php -text
ecrire/public/index.php -text
+ecrire/req/pg.php -text
ecrire/rien.gif -text
ecrire/typographie/en.php -text
ecrire/typographie/fr.php -text
diff --git a/ecrire/base/convert_sql_utf8.php b/ecrire/base/convert_sql_utf8.php
index ad85713c3d..1525130582 100644
--- a/ecrire/base/convert_sql_utf8.php
+++ b/ecrire/base/convert_sql_utf8.php
@@ -35,8 +35,6 @@ function base_convert_sql_utf8_dist($titre, $reprise=false)
// http://doc.spip.org/@convert_sql_utf8
function convert_sql_utf8(){
- include_spip('base/db_mysql');
- include_spip('base/abstract_sql');
define(_DEBUG_CONVERT, false);
$charset_spip = $GLOBALS['meta']['charset'];
diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php
index cf10ec7661..825a4524f3 100644
--- a/ecrire/inc/utils.php
+++ b/ecrire/inc/utils.php
@@ -214,9 +214,9 @@ function spip_connect_db($host, $port, $login, $pass, $db='', $type='mysql', $pr
if (!$prefixe)
$prefixe = isset($GLOBALS['table_prefix'])
? $GLOBALS['table_prefix'] : $db;
- $h = charger_fonction($g = 'db_' . $type, 'base', true);
+ $h = charger_fonction($type, 'req', true);
if (!$h) {
- spip_log("$g est indefinie");
+ spip_log("les reqûetes $type ne sont pas fournies");
return;
}
diff --git a/ecrire/base/db_mysql.php b/ecrire/req/mysql.php
similarity index 99%
rename from ecrire/base/db_mysql.php
rename to ecrire/req/mysql.php
index 74c8b22618..b5360f2c85 100644
--- a/ecrire/base/db_mysql.php
+++ b/ecrire/req/mysql.php
@@ -15,7 +15,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
// fonction pour la premiere connexion a un serveur MySQL
// http://doc.spip.org/@base_db_mysql_dist
-function base_db_mysql_dist($host, $port, $login, $pass, $db='', $prefixe='', $ldap='') {
+function req_mysql_dist($host, $port, $login, $pass, $db='', $prefixe='', $ldap='') {
if ($port > 0) $host = "$host:$port";
$link = mysql_connect($host, $login, $pass);
diff --git a/ecrire/base/db_pg.php b/ecrire/req/pg.php
similarity index 99%
rename from ecrire/base/db_pg.php
rename to ecrire/req/pg.php
index 8dd975ed51..abe5bf5119 100644
--- a/ecrire/base/db_pg.php
+++ b/ecrire/req/pg.php
@@ -22,7 +22,7 @@ define('_DEFAULT_DB', 'spip');
// si ca ne marche toujours pas, echec.
// http://doc.spip.org/@base_db_pg_dist
-function base_db_pg_dist($addr, $port, $login, $pass, $db='', $prefixe='', $ldap='') {
+function req_pg_dist($addr, $port, $login, $pass, $db='', $prefixe='', $ldap='') {
@list($host, $p) = split(';', $addr);
if ($p >0) $port = " port=$p" ; else $port = '';
--
GitLab