Trying to improve preset logs

diff --git a/sql/mailleur.sql b/sql/mailleur.sql
index 825717cdf9de793ee0db539aab4dc2a669ea49ba..8d3426d5dfc8becc4a16bdd7043e4a6878a926d6 100644 (file)
--- a/sql/mailleur.sql
+++ b/sql/mailleur.sql
@@ -175,17 +175,17 @@ CREATE TABLE admins       (
 #ifdef POSTGRESQL
 CREATE FUNCTION updpass()
   RETURNS trigger AS $$
+  DECLARE skip INT :=  0;
   BEGIN
-    DECLARE skip INT DEFAULT 0;
-    SET skip = skip_password_trigger;
+    skip := current_setting('skip_password_trigger', true)::int;
     IF skip = 0 THEN
       NEW.hash = md5(HASHING);
       NEW.password = crypt (NEW.password,gen_salt('md5'));
     ELSE
       NEW.password = NEW.password;
-    end if;
-    RETURN NEW;
-    END
+    END if;
+  RETURN NEW;
+  END;
   $$ LANGUAGE 'plpgsql';
 
 CREATE TRIGGER keephash

diff --git a/support/do_database.sh b/support/do_database.sh
index 6107f372e3de3238e30eeb23d1403e97a2fcedbb..dac6b56bc4c814fe27c9a02ccfffd08958f73590 100755 (executable)
--- a/support/do_database.sh
+++ b/support/do_database.sh
@@ -99,12 +99,16 @@ case "$DB_TYPE" in
 #loading database definition
 if [ -n "$MSQL" ] ; then
   echo "#--------------- Create Database ----------------" >> $SQLLOG
-  cpp -P -D$DB_TYPE /usr/share/$APPNAME/sql/$APPNAME.sql| tee -a $SQLLOG | $MSQL
+  cpp -P -D$DB_TYPE /usr/share/$APPNAME/sql/$APPNAME.sql       |       \
+               tee -a $SQLLOG                                  |       \
+               $MSQL >> $SQLLOG 2>&
   echo "#--------------- Set Preset value ---------------" >> $SQLLOG
   cpp -P -D$DB_TYPE                                                    \
          -DDOMAINNAME=\'$DOMAINNAME\'                                  \
          -DROOTDOMAINNAME=\'root@$DOMAINNAME\'                         \
          -DRPASS=\'$RPASS\'                                            \
-         /usr/share/$APPNAME/sql/preset.sql    | tee -a $SQLLOG | $MSQL
+         /usr/share/$APPNAME/sql/preset.sql                    |       \
+               tee -a $SQLLOG                                  |       \
+               $MSQL >> $SQLLOG 2>&
   echo "#--------------- Init Process Completed ---------" >> $SQLLOG
   fi