Alon Bar-Lev has uploaded a new change for review.
Change subject: db: cleanup: remove -f VERSION feature
......................................................................
db: cleanup: remove -f VERSION feature
apparently not used any more.
Change-Id: I24efcb7546ee496279fda7d111ae0d956f01e6ce
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M packaging/dbscripts/dbfunctions.sh
M packaging/dbscripts/upgrade.sh
2 files changed, 1 insertion(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/25226/1
diff --git a/packaging/dbscripts/dbfunctions.sh
b/packaging/dbscripts/dbfunctions.sh
index e3dbb59..9d3669c 100755
--- a/packaging/dbscripts/dbfunctions.sh
+++ b/packaging/dbscripts/dbfunctions.sh
@@ -218,10 +218,6 @@
set_version() {
execute_file upgrade/03_02_0000_set_version.sql ${DATABASE} ${SERVERNAME}
${PORT} > /dev/null
- if [ -n "${VERSION}" ]; then
- CMD="update schema_version set current=true where
version=trim('${VERSION}');"
- execute_command "${CMD}" ${DATABASE} ${SERVERNAME} ${PORT} > /dev/null
- fi
}
get_current_version() {
diff --git a/packaging/dbscripts/upgrade.sh b/packaging/dbscripts/upgrade.sh
index 1104023..bb79431 100755
--- a/packaging/dbscripts/upgrade.sh
+++ b/packaging/dbscripts/upgrade.sh
@@ -11,9 +11,6 @@
# [Name] is a short descriptive name for the script.
# All changes should be located under the upgrade/ directory
#
-# When using -f <version> all scripts with version greater than the given
one will
-# be re-executed , for example -f 0300100 will execute all scripts from
03000110
-# and forth
# Since all views $ SP are dropped before upgrade and restored after all
upgrade
# script were executed. We may have cases in which we need to run some helper
# functions before the upgrade script runs.
@@ -39,14 +36,13 @@
set_defaults
usage() {
- printf "Usage: ${ME} [-h] [-s SERVERNAME] [-p PORT] [-d DATABASE] [-u
USERNAME] [-f VERSION] [-c] [-g] [-m MD5DIR] [-v]\n"
+ printf "Usage: ${ME} [-h] [-s SERVERNAME] [-p PORT] [-d DATABASE] [-u
USERNAME] [-c] [-g] [-m MD5DIR] [-v]\n"
printf "\n"
printf "\t-s SERVERNAME - The database servername for the database (def.
${SERVERNAME})\n"
printf "\t-p PORT - The database port for the database (def.
${PORT})\n"
printf "\t-d DATABASE - The database name (def.
${DATABASE})\n"
printf "\t-u USERNAME - The username for the database (def.
engine)\n"
printf "\t-l LOGFILE - The logfile for capturing output (def.
${LOGFILE}\n"
- printf "\t-f VERSION - Force upgrading from specified version (def.
${VERSION}\n"
printf "\t-c - Force cleaning tasks and compensation info.\n"
printf "\t-g NOMD5 - Do not generate MD55 for files (generated in dev
env only) (def. ${NOMD5}\n"
printf "\t-m MD5DIR - The directory for generated MD5 files (generated
in dev env only) (def. ${MD5DIR}\n"
@@ -70,7 +66,6 @@
d) DATABASE=$OPTARG;;
u) USERNAME=$OPTARG;;
l) LOGFILE=$OPTARG;;
- f) VERSION=$OPTARG;;
c) CLEAN_TASKS=true;;
m) MD5DIR=$OPTARG;;
g) NOMD5=true;;
--
To view, visit http://gerrit.ovirt.org/25226
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I24efcb7546ee496279fda7d111ae0d956f01e6ce
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
