From 9797c7f2e0ce19e413027f13f8fb241f2678568d Mon Sep 17 00:00:00 2001 From: Roger Ferrel Date: Mon, 3 Aug 2015 16:22:40 -0500 Subject: [PATCH] Omaha #4360 Rename delta script's folder. Change-Id: If551d6c39c7aca761200c1734dc537b912da3f84 Former-commit-id: 8ab4092c6a9059bbab59146f0d4c867d261b8efe --- .../DR4360/alterAbstractWarningRecordDataURI.sh | 0 .../{16.1.2 => 16.2.1}/DR4360/alterAcarsDataURI.sh | 0 .../DR4360/alterBufrMosDataDataURI.sh | 0 .../DR4360/alterCcfpLocationDataURI.sh | 0 .../DR4360/alterCcfpRecordDataURI.sh | 0 .../DR4360/alterEmbAircraftObsLocationDataURI.sh | 0 .../DR4360/alterEmbSurfaceObsLocationDataURI.sh | 0 .../DR4360/alterGridTablesDataURI.sh | 0 .../DR4360/alterNPPSoundingRecordDataURI.sh | 0 .../DR4360/alterUniqueConstraintNames.sh | 0 .../{16.1.2 => 16.2.1}/DR4360/commonFunctions.sh | 12 +++--------- .../{16.1.2 => 16.2.1}/DR4360/updateTables.sh | 0 12 files changed, 3 insertions(+), 9 deletions(-) rename deltaScripts/{16.1.2 => 16.2.1}/DR4360/alterAbstractWarningRecordDataURI.sh (100%) rename deltaScripts/{16.1.2 => 16.2.1}/DR4360/alterAcarsDataURI.sh (100%) rename deltaScripts/{16.1.2 => 16.2.1}/DR4360/alterBufrMosDataDataURI.sh (100%) rename deltaScripts/{16.1.2 => 16.2.1}/DR4360/alterCcfpLocationDataURI.sh (100%) rename deltaScripts/{16.1.2 => 16.2.1}/DR4360/alterCcfpRecordDataURI.sh (100%) rename deltaScripts/{16.1.2 => 16.2.1}/DR4360/alterEmbAircraftObsLocationDataURI.sh (100%) rename deltaScripts/{16.1.2 => 16.2.1}/DR4360/alterEmbSurfaceObsLocationDataURI.sh (100%) rename deltaScripts/{16.1.2 => 16.2.1}/DR4360/alterGridTablesDataURI.sh (100%) rename deltaScripts/{16.1.2 => 16.2.1}/DR4360/alterNPPSoundingRecordDataURI.sh (100%) rename deltaScripts/{16.1.2 => 16.2.1}/DR4360/alterUniqueConstraintNames.sh (100%) rename deltaScripts/{16.1.2 => 16.2.1}/DR4360/commonFunctions.sh (80%) rename deltaScripts/{16.1.2 => 16.2.1}/DR4360/updateTables.sh (100%) diff --git a/deltaScripts/16.1.2/DR4360/alterAbstractWarningRecordDataURI.sh b/deltaScripts/16.2.1/DR4360/alterAbstractWarningRecordDataURI.sh similarity index 100% rename from deltaScripts/16.1.2/DR4360/alterAbstractWarningRecordDataURI.sh rename to deltaScripts/16.2.1/DR4360/alterAbstractWarningRecordDataURI.sh diff --git a/deltaScripts/16.1.2/DR4360/alterAcarsDataURI.sh b/deltaScripts/16.2.1/DR4360/alterAcarsDataURI.sh similarity index 100% rename from deltaScripts/16.1.2/DR4360/alterAcarsDataURI.sh rename to deltaScripts/16.2.1/DR4360/alterAcarsDataURI.sh diff --git a/deltaScripts/16.1.2/DR4360/alterBufrMosDataDataURI.sh b/deltaScripts/16.2.1/DR4360/alterBufrMosDataDataURI.sh similarity index 100% rename from deltaScripts/16.1.2/DR4360/alterBufrMosDataDataURI.sh rename to deltaScripts/16.2.1/DR4360/alterBufrMosDataDataURI.sh diff --git a/deltaScripts/16.1.2/DR4360/alterCcfpLocationDataURI.sh b/deltaScripts/16.2.1/DR4360/alterCcfpLocationDataURI.sh similarity index 100% rename from deltaScripts/16.1.2/DR4360/alterCcfpLocationDataURI.sh rename to deltaScripts/16.2.1/DR4360/alterCcfpLocationDataURI.sh diff --git a/deltaScripts/16.1.2/DR4360/alterCcfpRecordDataURI.sh b/deltaScripts/16.2.1/DR4360/alterCcfpRecordDataURI.sh similarity index 100% rename from deltaScripts/16.1.2/DR4360/alterCcfpRecordDataURI.sh rename to deltaScripts/16.2.1/DR4360/alterCcfpRecordDataURI.sh diff --git a/deltaScripts/16.1.2/DR4360/alterEmbAircraftObsLocationDataURI.sh b/deltaScripts/16.2.1/DR4360/alterEmbAircraftObsLocationDataURI.sh similarity index 100% rename from deltaScripts/16.1.2/DR4360/alterEmbAircraftObsLocationDataURI.sh rename to deltaScripts/16.2.1/DR4360/alterEmbAircraftObsLocationDataURI.sh diff --git a/deltaScripts/16.1.2/DR4360/alterEmbSurfaceObsLocationDataURI.sh b/deltaScripts/16.2.1/DR4360/alterEmbSurfaceObsLocationDataURI.sh similarity index 100% rename from deltaScripts/16.1.2/DR4360/alterEmbSurfaceObsLocationDataURI.sh rename to deltaScripts/16.2.1/DR4360/alterEmbSurfaceObsLocationDataURI.sh diff --git a/deltaScripts/16.1.2/DR4360/alterGridTablesDataURI.sh b/deltaScripts/16.2.1/DR4360/alterGridTablesDataURI.sh similarity index 100% rename from deltaScripts/16.1.2/DR4360/alterGridTablesDataURI.sh rename to deltaScripts/16.2.1/DR4360/alterGridTablesDataURI.sh diff --git a/deltaScripts/16.1.2/DR4360/alterNPPSoundingRecordDataURI.sh b/deltaScripts/16.2.1/DR4360/alterNPPSoundingRecordDataURI.sh similarity index 100% rename from deltaScripts/16.1.2/DR4360/alterNPPSoundingRecordDataURI.sh rename to deltaScripts/16.2.1/DR4360/alterNPPSoundingRecordDataURI.sh diff --git a/deltaScripts/16.1.2/DR4360/alterUniqueConstraintNames.sh b/deltaScripts/16.2.1/DR4360/alterUniqueConstraintNames.sh similarity index 100% rename from deltaScripts/16.1.2/DR4360/alterUniqueConstraintNames.sh rename to deltaScripts/16.2.1/DR4360/alterUniqueConstraintNames.sh diff --git a/deltaScripts/16.1.2/DR4360/commonFunctions.sh b/deltaScripts/16.2.1/DR4360/commonFunctions.sh similarity index 80% rename from deltaScripts/16.1.2/DR4360/commonFunctions.sh rename to deltaScripts/16.2.1/DR4360/commonFunctions.sh index 464a148dab..960c12fccb 100644 --- a/deltaScripts/16.1.2/DR4360/commonFunctions.sh +++ b/deltaScripts/16.2.1/DR4360/commonFunctions.sh @@ -9,27 +9,21 @@ where table_catalog = 'metadata' and table_schema='awips' and constraint_type='U constraint_name=(`${PSQL} -U awips -d metadata -t -c "$cmd"`) if [ $? -ne 0 ] ; then - echo "ERROR: Failed to obtain 'unnamed' unique constraint on table $1" - echo "FATAL: The update failed." - exit 1 + echo "ERROR: The update failed to obtain 'unnamed' unique constraint on table $1" fi cnLen=${#constraint_name[@]} if [ ${cnLen} -eq 0 ] ; then echo "WARNING: no UNIQUE constraint found for table $1" elif [ ${cnLen} -gt 1 ] ; then - echo "ERROR: More then one unnamed UNIQUE constraint found for table ${1} (${constraint_name[@]})" - echo "FATAL: The update has failed." - exit 1 + echo "ERROR: The update failed. More then one unnamed UNIQUE constraint found for table ${1} (${constraint_name[@]})" elif [ ${constraint_name} == ${2} ] ; then echo "INFO: No constraint rename on table ${table} performed; ${2} already exists." else echo "INFO: On $1 renaming constraint: ${constraint_name} to ${2}" ${PSQL} -U awips -d metadata -c "ALTER TABLE ${1} RENAME CONSTRAINT ${constraint_name} TO ${2} ;" if [ $? -ne 0 ] ; then - echo "ERROR: Failed on table $1 to rename unique constraint ${constraint_name} to $2." - echo "FATAL: The update failed." - exit 1 + echo "ERROR: The update failed on table $1 to rename unique constraint ${constraint_name} to $2." fi fi } diff --git a/deltaScripts/16.1.2/DR4360/updateTables.sh b/deltaScripts/16.2.1/DR4360/updateTables.sh similarity index 100% rename from deltaScripts/16.1.2/DR4360/updateTables.sh rename to deltaScripts/16.2.1/DR4360/updateTables.sh