Skip to content
Snippets Groups Projects
Commit ef933c09 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix: On crée les fonctions si le fichier functions.sql existe

parent 954f4d87
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
htdocs/install/etape2.php
+ 373
− 260
View file @ ef933c09
<?php <?php
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
* $Source$ * $Source$
* *
*/ */
include_once("./inc.php"); include_once("./inc.php");
$setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:$langcode); $setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:$langcode);
...@@ -74,10 +75,7 @@ if ($_POST["action"] == "set") ...@@ -74,10 +75,7 @@ if ($_POST["action"] == "set")
{ {
print "<tr><td>Erreur lors de la cration de : $dolibarr_main_db_name</td><td>".$langs->trans("Error")."</td></tr>"; print "<tr><td>Erreur lors de la cration de : $dolibarr_main_db_name</td><td>".$langs->trans("Error")."</td></tr>";
} }
/***************************************************************************************
*
*
*/
if ($ok) if ($ok)
{ {
if($db->database_selected == 1) if($db->database_selected == 1)
...@@ -90,27 +88,93 @@ if ($_POST["action"] == "set") ...@@ -90,27 +88,93 @@ if ($_POST["action"] == "set")
$ok = 0 ; $ok = 0 ;
} }
} }
/*************************************************************************************** /***************************************************************************************
* *
* Chargement fichiers tables/*.sql (non *.key.sql)
* A faire avant les fichiers *.key.sql
* *
*/ ***************************************************************************************/
if ($ok) if ($ok)
{ {
if ($choix==1) $dir = "../../mysql/tables/";
else $dir = "../../pgsql/tables/";
$ok = 0; $ok = 0;
if ($choix == 1) $handle=opendir($dir);
$table_exists = 0;
while (($file = readdir($handle))!==false)
{
if (substr($file, strlen($file) - 4) == '.sql' && substr($file,0,4) == 'llx_' && substr($file, -8) <> '.key.sql')
{
$name = substr($file, 0, strlen($file) - 4);
$buffer = '';
$fp = fopen($dir.$file,"r");
if ($fp)
{
while (!feof ($fp))
{
$buf = fgets($fp, 4096);
if (substr($buf, 0, 2) <> '--')
{ {
$dir = "../../mysql/tables/"; $buffer .= $buf;
}
}
fclose($fp);
}
//print "<tr><td>Cration de la table $name/td>";
if ($db->query($buffer))
{
//print "<td>OK requete ==== $buffer</td></tr>";
} }
else else
{ {
$dir = "../../pgsql/tables/"; if ($db->errno() == DB_ERROR_TABLE_ALREADY_EXISTS)
{
//print "<td>Dj existante</td></tr>";
$table_exists = 1;
}
else
{
print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey",$name)."</td>";
print "<td>".$langs->trans("Error")." ".$db->errno()." ".$db->error()."</td></tr>";
$error++;
}
}
} }
}
closedir($handle);
if ($error == 0)
{
print '<tr><td>';
print $langs->trans("TablesAndPrimaryKeysCreation").'</td><td>'.$langs->trans("OK").'</td></tr>';
$ok = 1;
}
}
/***************************************************************************************
*
* Chargement fichiers tables/*.key.sql
* A faire aprs les fichiers *.sql
*
***************************************************************************************/
if ($ok)
{
if ($choix==1) $dir = "../../mysql/tables/";
else $dir = "../../pgsql/tables/";
$okkeys = 0;
$handle=opendir($dir); $handle=opendir($dir);
$table_exists = 0; $table_exists = 0;
while (($file = readdir($handle))!==false) while (($file = readdir($handle))!==false)
{ {
if (substr($file, strlen($file) - 4) == '.sql' && substr($file,0,4) == 'llx_' && substr($file, - 8) <> '.key.sql') if (substr($file, strlen($file) - 4) == '.sql' && substr($file,0,4) == 'llx_' && substr($file, -8) == '.key.sql')
{ {
$name = substr($file, 0, strlen($file) - 4); $name = substr($file, 0, strlen($file) - 4);
//print "<tr><td>Cration de la table $name</td>"; //print "<tr><td>Cration de la table $name</td>";
...@@ -129,67 +193,95 @@ if ($_POST["action"] == "set") ...@@ -129,67 +193,95 @@ if ($_POST["action"] == "set")
fclose($fp); fclose($fp);
} }
if ($db->query($buffer)) // Si plusieurs requetes, on boucle sur chaque
$listesql=split(';',$buffer);
foreach ($listesql as $buffer) {
if (trim($buffer)) {
//print "<tr><td>Cration des cls et index de la table $name: '$buffer'</td>";
if ($db->query(trim($buffer)))
{ {
//print "<td>OK requete ==== $buffer</td></tr>"; //print "<td>OK requete ==== $buffer</td></tr>";
} }
else else
{ {
if ($db->errno() == DB_ERROR_TABLE_ALREADY_EXISTS) if ($db->errno() == DB_ERROR_CANNOT_CREATE || eregi('duplicate key name',$db->error()))
{ {
//print "<td>Dj existante</td></tr>"; //print "<td>Dj existante</td></tr>";
$table_exists = 1; $key_exists = 1;
} }
else else
{ {
print "<tr><td>Cration de la table $name</td>"; print "<tr><td>".$langs->trans("CreateOtherKeysForTable",$name)."</td>";
print "<td>".$langs->trans("Error")." ".$db->errno()." ".$db->error()."</td></tr>"; print "<td>".$langs->trans("Error")." ".$db->errno()." ".$db->error()."</td></tr>";
$error++; $error++;
} }
} }
} }
}
} }
//droit sur les tables
if ($db->query($grant_query))
{
print "<tr><td>Grant User '$nom' </td><td>".$langs->trans("OK")."</td></tr>";
} }
closedir($handle); closedir($handle);
if ($error == 0) if ($error == 0)
{ {
print '<tr><td>'; print '<tr><td>';
print $langs->trans("TablesAndPrimaryKeyCreation").'</td><td>'.$langs->trans("OK").'</td></tr>'; print $langs->trans("OtherKeysCreation").'</td><td>'.$langs->trans("OK").'</td></tr>';
$ok = 1; $okkeys = 1;
} }
} }
/*************************************************************************************** /***************************************************************************************
* *
* Chargement fichier data.sql * Positionnement des droits
* *
***************************************************************************************/ ***************************************************************************************/
if ($ok == 1) if ($ok)
{ {
// // Droits sur les tables
// Donnes if ($grant_query) {
// if ($db->query($grant_query))
if ($choix==1)
{ {
$dir = "../../mysql/data/"; print "<tr><td>Grant User</td><td>".$langs->trans("OK")."</td></tr>";
$file = "data.sql"; }
}
}
/***************************************************************************************
*
* Chargement fichier functions.sql
*
***************************************************************************************/
if ($ok)
{
if ($choix==1) $dir = "../../mysql/functions/";
else $dir = "../../pgsql/functions/";
// Cration donnes
$file = "functions.sql";
if (file_exists($dir.$file)) {
$fp = fopen($dir.$file,"r"); $fp = fopen($dir.$file,"r");
if ($fp) if ($fp)
{ {
while (!feof ($fp)) while (!feof ($fp))
{ {
$buffer = fgets($fp, 4096); $buffer = fgets($fp, 4096);
if (substr($buf, 0, 2) <> '--')
if (strlen(trim(ereg_replace("--","",$buffer))))
{ {
if ($db->query($buffer)) $buffer .= $buf;
}
}
fclose($fp);
}
// Si plusieurs requetes, on boucle sur chaque
$listesql=split('',eregi_replace(";';",";'",$buffer));
foreach ($listesql as $buffer) {
if (trim($buffer)) {
if ($db->query(trim($buffer)))
{ {
$ok = 1; $ok = 1;
} }
...@@ -207,21 +299,43 @@ if ($_POST["action"] == "set") ...@@ -207,21 +299,43 @@ if ($_POST["action"] == "set")
} }
} }
} }
fclose($fp);
print "<tr><td>".$langs->trans("FunctionsCreation")."</td>";
if ($ok)
{
print "<td>".$langs->trans("OK")."</td></tr>";
} }
}//choix==1
else else
{ {
$dir = "../../pgsql/data/"; print "<td>".$langs->trans("Error")."</td></tr>";
$ok = 1 ;
}
}
}
/***************************************************************************************
*
* Chargement fichier data.sql
*
***************************************************************************************/
if ($ok)
{
if ($choix==1) $dir = "../../mysql/data/";
else $dir = "../../pgsql/data/";
// Cration donnes
$file = "data.sql"; $file = "data.sql";
$fp = fopen($dir.$file,"r"); $fp = fopen($dir.$file,"r");
$buffer='';
if ($fp) if ($fp)
{ {
while (!feof ($fp)) while (!feof ($fp))
{ {
$buffer .= fgets($fp, 4096); $buffer = fgets($fp, 4096);
}
if (strlen(trim(ereg_replace("--","",$buffer))))
{
if ($db->query($buffer)) if ($db->query($buffer))
{ {
$ok = 1; $ok = 1;
...@@ -230,7 +344,7 @@ if ($_POST["action"] == "set") ...@@ -230,7 +344,7 @@ if ($_POST["action"] == "set")
{ {
if ($db->errno() == DB_ERROR_RECORD_ALREADY_EXISTS) if ($db->errno() == DB_ERROR_RECORD_ALREADY_EXISTS)
{ {
// print "<tr><td>Insertion ligne : $buffer</td><td>Dja existante</td></tr>"; // print "<tr><td>Insertion ligne : $buffer</td><td>
} }
else else
{ {
...@@ -238,11 +352,10 @@ if ($_POST["action"] == "set") ...@@ -238,11 +352,10 @@ if ($_POST["action"] == "set")
print "Erreur SQL ".$db->errno()." sur requete '$buffer': ".$db->error()."<br>"; print "Erreur SQL ".$db->errno()." sur requete '$buffer': ".$db->error()."<br>";
} }
} }
//}//while }
}
fclose($fp); fclose($fp);
} }
}//else
print "<tr><td>".$langs->trans("ReferenceDataLoading")."</td>"; print "<tr><td>".$langs->trans("ReferenceDataLoading")."</td>";
if ($ok) if ($ok)
......
pgsql/functions/functions.sql
+ 1
− 1
View file @ ef933c09
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment