Run Oracle schema scripts with explicit sqlplus exit

This commit is contained in:
Sergey Konovalov 2026-05-12 12:27:14 +03:00
parent bdab54c75c
commit bebc25f752
No known key found for this signature in database
GPG key ID: 46188A3FE3BD597E
2 changed files with 12 additions and 11 deletions

View file

@ -132,10 +132,6 @@ RUN PACKAGE_FILE="${COMPANY_NAME}-${PRODUCT_NAME}${PRODUCT_EDITION}${PACKAGE_VER
sed "s/COMPANY_NAME/${COMPANY_NAME}/g" -i /etc/supervisor/conf.d/*.conf && \
service supervisor stop && \
chmod 755 /app/ds/*.sh && \
printf "\nGO" >> "/var/www/$COMPANY_NAME/documentserver/server/schema/mssql/createdb.sql" && \
printf "\nGO" >> "/var/www/$COMPANY_NAME/documentserver/server/schema/mssql/removetbl.sql" && \
printf "\nexit" >> "/var/www/$COMPANY_NAME/documentserver/server/schema/oracle/createdb.sql" && \
printf "\nexit" >> "/var/www/$COMPANY_NAME/documentserver/server/schema/oracle/removetbl.sql" && \
rm -f /tmp/$PACKAGE_FILE && \
rm -rf /var/log/$COMPANY_NAME && \
rm -rf /var/lib/apt/lists/*

View file

@ -537,11 +537,18 @@ upgrade_mssql_tbl() {
$MSSQL < "$APP_DIR/server/schema/mssql/createdb.sql" >/dev/null 2>&1
}
upgrade_oracle_tbl() {
ORACLE_SQL="sqlplus $DB_USER/$DB_PWD@//$DB_HOST:$DB_PORT/${DB_NAME}"
run_oracle_sql_file() {
local sql_file="$1"
$ORACLE_SQL @$APP_DIR/server/schema/oracle/removetbl.sql >/dev/null 2>&1
$ORACLE_SQL @$APP_DIR/server/schema/oracle/createdb.sql >/dev/null 2>&1
sqlplus -s -L "$DB_USER/$DB_PWD@//$DB_HOST:$DB_PORT/${DB_NAME}" >/dev/null 2>&1 <<EOF
@"$sql_file"
exit
EOF
}
upgrade_oracle_tbl() {
run_oracle_sql_file "$APP_DIR/server/schema/oracle/removetbl.sql"
run_oracle_sql_file "$APP_DIR/server/schema/oracle/createdb.sql"
}
create_postgresql_tbl() {
@ -578,9 +585,7 @@ create_mssql_tbl() {
}
create_oracle_tbl() {
ORACLE_SQL="sqlplus $DB_USER/$DB_PWD@//$DB_HOST:$DB_PORT/${DB_NAME}"
$ORACLE_SQL @$APP_DIR/server/schema/oracle/createdb.sql >/dev/null 2>&1
run_oracle_sql_file "$APP_DIR/server/schema/oracle/createdb.sql"
}
update_welcome_page() {