[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

SF.net SVN: ledger-smb:[4274] branches/1.3/tools/prepare-company-database. sh



Revision: 4274
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4274&view=rev
Author:   ehuelsmann
Date:     2012-01-20 23:16:10 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
Solve bug 3441622: prepare-company-database.sh doesn't work with Pg 9.1

Modified Paths:
--------------
    branches/1.3/tools/prepare-company-database.sh

Modified: branches/1.3/tools/prepare-company-database.sh
===================================================================
--- branches/1.3/tools/prepare-company-database.sh	2012-01-20 23:08:38 UTC (rev 4273)
+++ branches/1.3/tools/prepare-company-database.sh	2012-01-20 23:16:10 UTC (rev 4274)
@@ -169,8 +169,11 @@
   exit 1
 fi
 
-if test "$pgsql_contrib_dir" = "ignore"
+is_v9_1plus=`su -c "psql -U postgres -d postgres -c 'SELECT version();'" | grep -E 'PostgreSQL 9.[1-9]'`
+
+if test "$pgsql_contrib_dir" = "ignore" -a -z "$is_v9_1plus"
 then
+  # --pgsql-contrib argument not required due to 9.1+ CREATE EXTENSION system
   echo "missing argument --pgsql-contrib!"
   usage
   exit 1

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.