From 7d4a9b17b6d08d041637e25322dd4aacc1e992ec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Sep 2015 13:59:22 +0200
Subject: [PATCH] FIX Creation of tables or keys must not be done with a random
order.
---
htdocs/core/modules/DolibarrModules.class.php | 28 +++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index c886741fc41..0de1c7ab4ab 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -623,8 +623,14 @@ abstract class DolibarrModules
{
$dirfound++;
- // Run llx_mytable.sql files
+ // Run llx_mytable.sql files, then llx_mytable_*.sql
+ $files = array();
while (($file = readdir($handle))!==false)
+ {
+ $files[] = $file;
+ }
+ sort($files);
+ foreach ($files as $file)
{
if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'llx_' && substr($file,0,4) != 'data')
{
@@ -635,8 +641,14 @@ abstract class DolibarrModules
rewinddir($handle);
- // Run llx_mytable.key.sql files (Must be done after llx_mytable.sql)
+ // Run llx_mytable.key.sql files (Must be done after llx_mytable.sql) then then llx_mytable_*.key.sql
+ $files = array();
while (($file = readdir($handle))!==false)
+ {
+ $files[] = $file;
+ }
+ sort($files);
+ foreach ($files as $file)
{
if (preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'llx_' && substr($file,0,4) != 'data')
{
@@ -648,7 +660,13 @@ abstract class DolibarrModules
rewinddir($handle);
// Run data_xxx.sql files (Must be done after llx_mytable.key.sql)
+ $files = array();
while (($file = readdir($handle))!==false)
+ {
+ $files[] = $file;
+ }
+ sort($files);
+ foreach ($files as $file)
{
if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'data')
{
@@ -660,7 +678,13 @@ abstract class DolibarrModules
rewinddir($handle);
// Run update_xxx.sql files
+ $files = array();
while (($file = readdir($handle))!==false)
+ {
+ $files[] = $file;
+ }
+ sort($files);
+ foreach ($files as $file)
{
if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,6) == 'update')
{
--
GitLab