Merge 700adc820464
This commit is contained in:
commit
1e00ab52ff
|
@ -38,4 +38,4 @@ read in
|
||||||
|
|
||||||
# Parameter: <systemAccount> <AdempiereID> <AdempierePwd>
|
# Parameter: <systemAccount> <AdempiereID> <AdempierePwd>
|
||||||
# globalqss - cruiz - 2007-10-09 - added fourth parameter for postgres(ignored in oracle)
|
# globalqss - cruiz - 2007-10-09 - added fourth parameter for postgres(ignored in oracle)
|
||||||
$ADEMPIERE_DB_PATH/ImportIdempiere.sh $SYSUSER/$ADEMPIERE_DB_SYSTEM $ADEMPIERE_DB_USER $ADEMPIERE_DB_PASSWORD $ADEMPIERE_DB_SYSTEM
|
$ADEMPIERE_DB_PATH/ImportIdempiere.sh $SYSUSER/$ADEMPIERE_DB_SYSTEM $ADEMPIERE_DB_USER $ADEMPIERE_DB_PASSWORD $ADEMPIERE_DB_SYSTEM $SUFFIX
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# $Id: ImportAdempiere.sh,v 1.10 2005/12/20 07:12:17 jjanke Exp $
|
# $Id: ImportAdempiere.sh,v 1.10 2005/12/20 07:12:17 jjanke Exp $
|
||||||
echo idempiere Database Import $Revision: 1.10 $
|
echo idempiere Database Import $Revision: 1.10 $
|
||||||
|
|
||||||
echo Importing idempiere DB from $IDEMPIERE_HOME/data/seed/Adempiere_pg.dmp
|
echo Importing idempiere DB from $IDEMPIERE_HOME/data/seed/Adempiere$5.dmp
|
||||||
|
|
||||||
if [ $# -le 2 ]
|
if [ $# -le 2 ]
|
||||||
then
|
then
|
||||||
|
@ -39,11 +39,11 @@ export PGPASSWORD
|
||||||
createdb --template=template0 -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -E UNICODE -O $2 -U $2 $ADEMPIERE_DB_NAME
|
createdb --template=template0 -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -E UNICODE -O $2 -U $2 $ADEMPIERE_DB_NAME
|
||||||
|
|
||||||
echo -------------------------------------
|
echo -------------------------------------
|
||||||
echo Import Adempiere_pg.dmp
|
echo Import Adempiere$5.dmp
|
||||||
echo -------------------------------------
|
echo -------------------------------------
|
||||||
ADEMPIERE_ALTER_ROLE_SQL="ALTER ROLE $2 SET search_path TO adempiere, pg_catalog"
|
ADEMPIERE_ALTER_ROLE_SQL="ALTER ROLE $2 SET search_path TO adempiere, pg_catalog"
|
||||||
psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $2 -c "$ADEMPIERE_ALTER_ROLE_SQL"
|
psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $2 -c "$ADEMPIERE_ALTER_ROLE_SQL"
|
||||||
psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $2 -f $IDEMPIERE_HOME/data/seed/Adempiere_pg.dmp
|
psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $2 -f $IDEMPIERE_HOME/data/seed/Adempiere$5.dmp
|
||||||
ADEMPIERE_ALTER_ROLE_SQL=
|
ADEMPIERE_ALTER_ROLE_SQL=
|
||||||
PGPASSWORD=
|
PGPASSWORD=
|
||||||
export PGPASSWORD
|
export PGPASSWORD
|
||||||
|
|
|
@ -27,6 +27,6 @@ cd %IDEMPIERE_HOME%\utils
|
||||||
|
|
||||||
@Rem Parameter: <systemAccount> <AdempiereID> <AdempierePwd>
|
@Rem Parameter: <systemAccount> <AdempiereID> <AdempierePwd>
|
||||||
@Rem globalqss - cruiz - 2007-10-09 - added fourth parameter for postgres (ignored in oracle)
|
@Rem globalqss - cruiz - 2007-10-09 - added fourth parameter for postgres (ignored in oracle)
|
||||||
@call %ADEMPIERE_DB_PATH%\ImportIdempiere %SYSUSER%/%ADEMPIERE_DB_SYSTEM% %ADEMPIERE_DB_USER% %ADEMPIERE_DB_PASSWORD% %ADEMPIERE_DB_SYSTEM%
|
@call %ADEMPIERE_DB_PATH%\ImportIdempiere %SYSUSER%/%ADEMPIERE_DB_SYSTEM% %ADEMPIERE_DB_USER% %ADEMPIERE_DB_PASSWORD% %ADEMPIERE_DB_SYSTEM% %SUFFIX%
|
||||||
|
|
||||||
@pause
|
@pause
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
@Rem $Id: ImportIdempiere.bat,v 1.3 2005/01/22 21:59:15 jjanke Exp $
|
@Rem $Id: ImportIdempiere.bat,v 1.3 2005/01/22 21:59:15 jjanke Exp $
|
||||||
|
|
||||||
@Echo Importing idempiere DB from %IDEMPIERE_HOME%\data\seed\Adempiere_pg.dmp (%ADEMPIERE_DB_NAME%)
|
@Echo Importing idempiere DB from %IDEMPIERE_HOME%\data\seed\Adempiere%5.dmp (%ADEMPIERE_DB_NAME%)
|
||||||
|
|
||||||
@if (%IDEMPIERE_HOME%) == () goto environment
|
@if (%IDEMPIERE_HOME%) == () goto environment
|
||||||
@if (%ADEMPIERE_DB_NAME%) == () goto environment
|
@if (%ADEMPIERE_DB_NAME%) == () goto environment
|
||||||
|
@ -27,13 +27,13 @@
|
||||||
@createdb --template=template0 -h %ADEMPIERE_DB_SERVER% -p %ADEMPIERE_DB_PORT% -E UNICODE -O %2 -U %2 %ADEMPIERE_DB_NAME%
|
@createdb --template=template0 -h %ADEMPIERE_DB_SERVER% -p %ADEMPIERE_DB_PORT% -E UNICODE -O %2 -U %2 %ADEMPIERE_DB_NAME%
|
||||||
|
|
||||||
@echo -------------------------------------
|
@echo -------------------------------------
|
||||||
@echo Import Adempiere_pg.dmp
|
@echo Import Adempiere%5.dmp
|
||||||
@echo -------------------------------------
|
@echo -------------------------------------
|
||||||
@set ADEMPIERE_ALTER_ROLE_SQL=ALTER ROLE %2 SET search_path TO adempiere, pg_catalog
|
@set ADEMPIERE_ALTER_ROLE_SQL=ALTER ROLE %2 SET search_path TO adempiere, pg_catalog
|
||||||
|
|
||||||
@psql -h %ADEMPIERE_DB_SERVER% -p %ADEMPIERE_DB_PORT% -d %ADEMPIERE_DB_NAME% -U %2 -c "%ADEMPIERE_ALTER_ROLE_SQL%"
|
@psql -h %ADEMPIERE_DB_SERVER% -p %ADEMPIERE_DB_PORT% -d %ADEMPIERE_DB_NAME% -U %2 -c "%ADEMPIERE_ALTER_ROLE_SQL%"
|
||||||
|
|
||||||
@psql -h %ADEMPIERE_DB_SERVER% -p %ADEMPIERE_DB_PORT% -d %ADEMPIERE_DB_NAME% -U %2 -f %IDEMPIERE_HOME%/data/seed/Adempiere_pg.dmp
|
@psql -h %ADEMPIERE_DB_SERVER% -p %ADEMPIERE_DB_PORT% -d %ADEMPIERE_DB_NAME% -U %2 -f %IDEMPIERE_HOME%/data/seed/Adempiere%5.dmp
|
||||||
@set ADEMPIERE_ALTER_ROLE_SQL=
|
@set ADEMPIERE_ALTER_ROLE_SQL=
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue