[Greater-commits] r3866 - in trunk/packaging: . defaultdata

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-12-06 18:07:49 +0100 (Tue, 06 Dec 2011)
New Revision: 3866

Added:
   trunk/packaging/defaultdata/91_greater_compat.sql
   trunk/packaging/defaultdata/92_sediment_compat.sql
Modified:
   trunk/packaging/greater-installer.nsi
   trunk/packaging/makeinstaller.py
Log:
Make large objects use postgre 8.4 compatibility mode to
fix access right issues when the user is not a superuser


Added: trunk/packaging/defaultdata/91_greater_compat.sql
===================================================================
--- trunk/packaging/defaultdata/91_greater_compat.sql	2011-12-06 14:43:46 UTC (rev 3865)
+++ trunk/packaging/defaultdata/91_greater_compat.sql	2011-12-06 17:07:49 UTC (rev 3866)
@@ -0,0 +1 @@
+ALTER DATABASE greater set lo_compat_privileges='on';

Added: trunk/packaging/defaultdata/92_sediment_compat.sql
===================================================================
--- trunk/packaging/defaultdata/92_sediment_compat.sql	2011-12-06 14:43:46 UTC (rev 3865)
+++ trunk/packaging/defaultdata/92_sediment_compat.sql	2011-12-06 17:07:49 UTC (rev 3866)
@@ -0,0 +1 @@
+ALTER DATABASE "greater-sediment" set lo_compat_privileges='on';

Modified: trunk/packaging/greater-installer.nsi
===================================================================
--- trunk/packaging/greater-installer.nsi	2011-12-06 14:43:46 UTC (rev 3865)
+++ trunk/packaging/greater-installer.nsi	2011-12-06 17:07:49 UTC (rev 3866)
@@ -64,7 +64,7 @@
   !define MUI_WELCOMEPAGE_TITLE "Welcome to the installation of GREAT-ER 3.0 - PostgreSQL"
   !define MUI_WELCOMEPAGE_TEXT "This Installer will install \r\n\
   The Geo-referenced Regional Exposure Assesment Tool for European Rivers\r\n\
-  Version ${version_number} using the Postges SQL Database backend."
+  Version ${version_number} using the PostgreSQL Database backend."
   !define MUI_HEADERIMAGE_BITMAP ""
   !define MUI_COMPONENTSPAGE_TEXT_TOP "Please select installation type"
   !define MUI_WELCOMEFINISHPAGE_BITMAP "ressources\welcome_left.bmp"
@@ -190,6 +190,9 @@
   File "defaultdata\defaultdb.backup"
   File "defaultdata\10_create_users.sql"
   File "defaultdata\90_grant_access.sql"
+  File "defaultdata\91_greater_compat.sql"
+  File "defaultdata\92_sediment_compat.sql"
+
   DetailPrint "Creating default GREAT-ER datasets"
   ExecDos::exec '"$INSTDIR\postgres9\bin\pg_restore.exe" -C -O -d postgres -U greater \
   "$TEMP\defaultdb.backup"' "" "$TEMP\greater_insert.log"
@@ -197,6 +200,8 @@
   "$TEMP\10_create_users.sql"' "" "$TEMP\greater_insert.log"
   ExecDos::exec '"$INSTDIR\postgres9\bin\psql" -d greater -U greater -f \
   "$TEMP\90_grant_access.sql"' "" "$TEMP\greater_insert.log"
+  ExecDos::exec '"$INSTDIR\postgres9\bin\psql" -d greater -U greater -f \
+  "$TEMP\91_greater_compat.sql"' "" "$TEMP\greater_compat.log"
 
   ; Also the sediment database?
   File "defaultdata\sedimentdb.backup"
@@ -206,11 +211,15 @@
   "$TEMP\10_create_users.sql"' "" "$TEMP\greater_sediment_insert.log"
   ExecDos::exec '"$INSTDIR\postgres9\bin\psql" -d greater-sediment -U greater -f \
   "$TEMP\90_grant_access.sql"' "" "$TEMP\greater_sediment_insert.log"
+  ExecDos::exec '"$INSTDIR\postgres9\bin\psql" -d greater-sediment -U greater -f \
+  "$TEMP\92_sediment_compat.sql"' "" "$TEMP\sediment_compat.log"
 
   Delete "$TEMP\sedimentdb.backup"
   Delete "$TEMP\defaultdb.backup"
   Delete "$TEMP\10_create_users.sql"
   Delete "$TEMP\90_grant_access.sql"
+  Delete "$TEMP\91_greater_compat.sql"
+  Delete "$TEMP\92_sediment_compat.sql"
 
   ; Database should now be ready
 SectionEnd

Modified: trunk/packaging/makeinstaller.py
===================================================================
--- trunk/packaging/makeinstaller.py	2011-12-06 14:43:46 UTC (rev 3865)
+++ trunk/packaging/makeinstaller.py	2011-12-06 17:07:49 UTC (rev 3866)
@@ -41,7 +41,7 @@
         "productname_short" : "GREAT-ER",
         "description" : ("Geo-referenced Regional Exposure "
                          "Assessment Tool for European Rivers"),
-        "version_number" : "3.0.0.4",
+        "version_number" : "3.0.1.1",
         "version_date" : time.strftime("%Y-%m-%d-%H-%M")}