From 8c099ff1445b6fe971b584749cf8735f438fb0cf Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 28 Feb 2017 13:35:29 +0100 Subject: [PATCH] Fix oracle datapump scripts --- .../utils.unix/oracle/DBExportFulldp.sh | 2 +- .../utils.unix/oracle/DBExportdp.sh | 2 +- .../utils.unix/oracle/DBRestoredp.sh | 2 +- .../utils.unix/oracle/ImportIdempiere.sh | 2 +- .../utils.windows/oracle/ImportIdempiere.bat | 11 ++++++++--- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/org.adempiere.server-feature/utils.unix/oracle/DBExportFulldp.sh b/org.adempiere.server-feature/utils.unix/oracle/DBExportFulldp.sh index 918e2ad964..be0e0c3206 100644 --- a/org.adempiere.server-feature/utils.unix/oracle/DBExportFulldp.sh +++ b/org.adempiere.server-feature/utils.unix/oracle/DBExportFulldp.sh @@ -24,7 +24,7 @@ fi echo ------------------------------------- echo Re-Create DataPump directory echo ------------------------------------- -sqlplus $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateDataPumpDir.sql $IDEMPIERE_HOME/data +sqlplus $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateDataPumpDir.sql $IDEMPIERE_HOME/data chgrp dba $IDEMPIERE_HOME/data chmod 770 $IDEMPIERE_HOME/data diff --git a/org.adempiere.server-feature/utils.unix/oracle/DBExportdp.sh b/org.adempiere.server-feature/utils.unix/oracle/DBExportdp.sh index 15cb3f33ac..f7bdd46045 100644 --- a/org.adempiere.server-feature/utils.unix/oracle/DBExportdp.sh +++ b/org.adempiere.server-feature/utils.unix/oracle/DBExportdp.sh @@ -27,7 +27,7 @@ sqlplus $1/$2@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$IDEMP echo ------------------------------------- echo Re-Create DataPump directory echo ------------------------------------- -sqlplus $3@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateDataPumpDir.sql $IDEMPIERE_HOME/data +sqlplus $3@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateDataPumpDir.sql $IDEMPIERE_HOME/data chgrp dba $IDEMPIERE_HOME/data chmod 770 $IDEMPIERE_HOME/data diff --git a/org.adempiere.server-feature/utils.unix/oracle/DBRestoredp.sh b/org.adempiere.server-feature/utils.unix/oracle/DBRestoredp.sh index 7371e5146c..2ebd876df1 100644 --- a/org.adempiere.server-feature/utils.unix/oracle/DBRestoredp.sh +++ b/org.adempiere.server-feature/utils.unix/oracle/DBRestoredp.sh @@ -28,7 +28,7 @@ sqlplus $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$IDEMPIER echo ------------------------------------- echo Re-Create DataPump directory echo ------------------------------------- -sqlplus $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateDataPumpDir.sql $IDEMPIERE_HOME/data +sqlplus $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateDataPumpDir.sql $IDEMPIERE_HOME/data chgrp dba $IDEMPIERE_HOME/data chmod 770 $IDEMPIERE_HOME/data diff --git a/org.adempiere.server-feature/utils.unix/oracle/ImportIdempiere.sh b/org.adempiere.server-feature/utils.unix/oracle/ImportIdempiere.sh index 6b23752c7b..dabbc996ce 100644 --- a/org.adempiere.server-feature/utils.unix/oracle/ImportIdempiere.sh +++ b/org.adempiere.server-feature/utils.unix/oracle/ImportIdempiere.sh @@ -29,7 +29,7 @@ sqlplus $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$IDEMPIER echo ------------------------------------- echo Re-Create DataPump directory echo ------------------------------------- -sqlplus $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateDataPumpDir.sql $IDEMPIERE_HOME/data/seed +sqlplus $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateDataPumpDir.sql $IDEMPIERE_HOME/data/seed chgrp dba $IDEMPIERE_HOME/data/seed chmod 770 $IDEMPIERE_HOME/data/seed diff --git a/org.adempiere.server-feature/utils.windows/oracle/ImportIdempiere.bat b/org.adempiere.server-feature/utils.windows/oracle/ImportIdempiere.bat index c8118f17ca..319fb80ad7 100644 --- a/org.adempiere.server-feature/utils.windows/oracle/ImportIdempiere.bat +++ b/org.adempiere.server-feature/utils.windows/oracle/ImportIdempiere.bat @@ -18,14 +18,19 @@ @echo ------------------------------------- @sqlplus %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%IDEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\CreateUser.sql %2 %3 +@echo ------------------------------------- +@echo Re-Create DataPump directory +@echo ------------------------------------- +@sqlplus %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%IDEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\CreateDataPumpDir.sql %IDEMPIERE_HOME%\data\seed + @echo ------------------------------------- @echo Import Adempiere.dmp @echo ------------------------------------- -@imp %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% FILE=%IDEMPIERE_HOME%\data\seed\Adempiere.dmp FROMUSER=(reference) TOUSER=%2 STATISTICS=RECALCULATE +@impdp %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% DIRECTORY=ADEMPIERE_DATA_PUMP_DIR DUMPFILE=Adempiere.dmp REMAP_SCHEMA=reference:%2 @echo --------========--------========--------========-------- -@echo System Check - The Import phase showed warnings. -@echo This is OK as long as the following does not show errors +@echo Check System +@echo Import may show some warnings. This is OK as long as the following does not show errors @echo --------========--------========--------========-------- @sqlplus %2/%3@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%IDEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\AfterImport.sql