[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 136/173: Bug database.class.php : n'applique
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 136/173: Bug database.class.php : n'applique pas le patch |
Date: |
Mon, 22 Mar 2021 12:59:11 -0400 (EDT) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 05ffc8c6082bc13a5c14eeb25d78dad1509ee4d7
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: Sat Apr 4 14:28:47 2020 +0200
Bug database.class.php : n'applique pas le patch
---
include/class/database.class.php | 4 ++--
include/lib/database_core.class.php | 1 +
include/sql/patch/upgrade142.sql | 7 ++++---
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/include/class/database.class.php b/include/class/database.class.php
index 216d3f4..101cc5e 100644
--- a/include/class/database.class.php
+++ b/include/class/database.class.php
@@ -133,7 +133,6 @@ class Database extends DatabaseCore
echo '<ul style="list-type-style:square">';
for ($i = 4; $i <= $MaxVersion; $i++) {
$to = $i + 1;
-
if ($this->get_version() <= $i) {
if ($this->get_version() == 97) {
if ($this->exist_schema("amortissement")) {
@@ -145,7 +144,8 @@ class Database extends DatabaseCore
echo "<li>Patching " . $p_name .
" from the version " . $this->get_version() . " to $to ";
-
+ $this->execute_script(NOALYSS_INCLUDE . '/sql/patch/upgrade' .
$i . '.sql');
+ echo $succeed;
if (!DEBUG)
ob_start();
diff --git a/include/lib/database_core.class.php
b/include/lib/database_core.class.php
index 3deb582..098b7d6 100644
--- a/include/lib/database_core.class.php
+++ b/include/lib/database_core.class.php
@@ -284,6 +284,7 @@ class DatabaseCore
if ($hf == false) {
throw new Exception ('Ne peut ouvrir ' . $script);
}
+ printf (" open %s <br>", $script);
$sql = "";
$flag_function = false;
while (!feof($hf)) {
diff --git a/include/sql/patch/upgrade142.sql b/include/sql/patch/upgrade142.sql
index 3afaed6..35dc934 100644
--- a/include/sql/patch/upgrade142.sql
+++ b/include/sql/patch/upgrade142.sql
@@ -2,7 +2,7 @@ begin;
CREATE OR REPLACE FUNCTION comptaproc.find_pcm_type(pp_value account_type)
RETURNS text
-AS $function$
+AS $BODY$
declare
str_type parm_poste.p_type%TYPE;
str_value parm_poste.p_type%TYPE;
@@ -37,7 +37,8 @@ begin
-- si ni parent ou parm_poste alors return CON
return 'CON';
end;
-$function$
- LANGUAGE plpgsql;
+$BODY$
+LANGUAGE plpgsql;
+
insert into version (val,v_description) values (143,'Corrige function
find_pcm_type');
commit ;
- [Noalyss-commit] [noalyss] 171/173: Cosmetic button, (continued)
- [Noalyss-commit] [noalyss] 171/173: Cosmetic button, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 94/173: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 107/173: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 115/173: indent, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 118/173: Adapt printtva to entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 121/173: test : find the accounting with the biggest number of records, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 124/173: Merge branch 'v7110-stable' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 122/173: test : use the accounting with the biggest number of records, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 127/173: Merge branch 'dev7112' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 133/173: Test Acc_Account, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 136/173: Bug database.class.php : n'applique pas le patch,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 143/173: Merge commit '57309561191906d4099c8db08b7fa737f7c8e1e0' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 144/173: Merge commit 'b8fafe1f2b705272b9e3853a8a791200fb718fa6' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 148/173: Merge branch 'dev7400-1' into next-release-8, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 149/173: Merge branch 'enterprise' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 155/173: Merge branch 'master' into dev-8-bootstrap, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 156/173: rel8100 Merge branch 'master' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 157/173: Merge branch 'dev-8-bug-saldo-not-checked', Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 161/173: Move CSS and start to integrate BootStrap, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 163/173: Move CSS and start to integrate BootStrap Add fonts, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 165/173: Currency : adapt test, Dany De Bontridder, 2021/03/22