midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-4441 More fixes to the SyncDB command (#278) 

Oracle fix - actual script is ignoring SP2 error messages
Postgresql improvement to show the SQL command that throws error
This commit is contained in:
Carlos Ruiz 2020-09-28 12:32:29 +02:00 committed by GitHub
parent 41513ba3b1
commit 2d40c5104a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.server-feature/utils.unix/oracle/SyncDB.sh
View File

@ -29,7 +29,7 @@ ADEMPIERE_DB_PASSWORD=$2
ADEMPIERE_DB_PATH=$3 ADEMPIERE_DB_PATH=$3
CMD="sqlplus $ADEMPIERE_DB_USER/$ADEMPIERE_DB_PASSWORD@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME" CMD="sqlplus $ADEMPIERE_DB_USER/$ADEMPIERE_DB_PASSWORD@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME"
SILENTCMD="sqlplus -S $ADEMPIERE_DB_USER/$ADEMPIERE_DB_PASSWORD@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME" SILENTCMD="sqlplus -S $ADEMPIERE_DB_USER/$ADEMPIERE_DB_PASSWORD@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME"
ERROR_STRINGS="^(ORA-[0-9]+:|TNS-|PLS-)" ERROR_STRINGS="\b(ORA-[0-9]+:|TNS-|PLS-|SP2-)"
DIR_POST=$IDEMPIERE_HOME/migration DIR_POST=$IDEMPIERE_HOME/migration
if [ "x$4" = "x" ] if [ "x$4" = "x" ]
then then

2
org.adempiere.server-feature/utils.unix/postgresql/MonitoredSyncDB.sh
View File

@ -66,7 +66,7 @@ export PGPASSWORD
TMPFOLDER=/tmp TMPFOLDER=/tmp
ADEMPIERE_DB_USER=$1 ADEMPIERE_DB_USER=$1
ADEMPIERE_DB_PATH=$3 ADEMPIERE_DB_PATH=$3
CMD="psql -b -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $ADEMPIERE_DB_USER" CMD="psql -b -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $ADEMPIERE_DB_USER -b"
SILENTCMD="$CMD -q -t" SILENTCMD="$CMD -q -t"
ERROR_STRINGS="^(ERROR:|FEHLER:|FATAL:|ERRO:)" ERROR_STRINGS="^(ERROR:|FEHLER:|FATAL:|ERRO:)"
DIR_POST=$IDEMPIERE_HOME/migration DIR_POST=$IDEMPIERE_HOME/migration

2
org.adempiere.server-feature/utils.unix/postgresql/SyncDB.sh
View File

@ -29,7 +29,7 @@ export PGPASSWORD
TMPFOLDER=/tmp TMPFOLDER=/tmp
ADEMPIERE_DB_USER=$1 ADEMPIERE_DB_USER=$1
ADEMPIERE_DB_PATH=$3 ADEMPIERE_DB_PATH=$3
CMD="psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $ADEMPIERE_DB_USER" CMD="psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $ADEMPIERE_DB_USER -b"
SILENTCMD="$CMD -q -t" SILENTCMD="$CMD -q -t"
ERROR_STRINGS="^(ERROR:|FEHLER:|FATAL:|ERRO:)" ERROR_STRINGS="^(ERROR:|FEHLER:|FATAL:|ERRO:)"
DIR_POST=$IDEMPIERE_HOME/migration DIR_POST=$IDEMPIERE_HOME/migration