From 7249e3608161ccf9ae11f754569c85fea349ecc8 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Tue, 27 Nov 2012 12:07:51 -0500
Subject: [PATCH] -2.2.1 upgrade scripts

---
 VERSION                                       |  2 +-
 install_minimal/include/airtime-constants.php |  2 +-
 install_minimal/include/airtime-upgrade.php   |  4 ++++
 .../upgrades/airtime-2.2.1/DbUpgrade.php      | 24 +++++++++++++++++++
 .../airtime-2.2.1/airtime-upgrade.php         |  8 +++++++
 .../upgrades/airtime-2.2.1/data/upgrade.sql   |  9 +++++++
 python_apps/api_clients/api_client.py         |  2 +-
 7 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 install_minimal/upgrades/airtime-2.2.1/DbUpgrade.php
 create mode 100644 install_minimal/upgrades/airtime-2.2.1/airtime-upgrade.php
 create mode 100644 install_minimal/upgrades/airtime-2.2.1/data/upgrade.sql

diff --git a/VERSION b/VERSION
index c7aac0e6d..491e6ae5c 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
 PRODUCT_ID=Airtime
-PRODUCT_RELEASE=2.2.0
+PRODUCT_RELEASE=2.2.1
diff --git a/install_minimal/include/airtime-constants.php b/install_minimal/include/airtime-constants.php
index 8d028ec63..2968cab36 100644
--- a/install_minimal/include/airtime-constants.php
+++ b/install_minimal/include/airtime-constants.php
@@ -1,3 +1,3 @@
 <?php
 
-define('AIRTIME_VERSION', '2.2.0');
+define('AIRTIME_VERSION', '2.2.1');
diff --git a/install_minimal/include/airtime-upgrade.php b/install_minimal/include/airtime-upgrade.php
index 4c7e7f4c0..55fe33f30 100644
--- a/install_minimal/include/airtime-upgrade.php
+++ b/install_minimal/include/airtime-upgrade.php
@@ -100,4 +100,8 @@ if (strcmp($version, "2.2.0") < 0) {
     passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.2.0/airtime-upgrade.php");
     pause();
 }  
+if (strcmp($version, "2.2.1") < 0) {
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.2.1/airtime-upgrade.php");
+    pause();
+}  
 echo "******************************* Upgrade Complete *******************************".PHP_EOL;
diff --git a/install_minimal/upgrades/airtime-2.2.1/DbUpgrade.php b/install_minimal/upgrades/airtime-2.2.1/DbUpgrade.php
new file mode 100644
index 000000000..bda71b900
--- /dev/null
+++ b/install_minimal/upgrades/airtime-2.2.1/DbUpgrade.php
@@ -0,0 +1,24 @@
+<?php
+
+/* All functions other than start() should be marked as
+ * private.
+ */
+class AirtimeDatabaseUpgrade{
+
+    public static function start($p_dbValues){
+        echo "* Updating Database".PHP_EOL;
+        self::task0($p_dbValues);
+        echo " * Complete".PHP_EOL;
+    }
+
+    private static function task0($p_dbValues){
+        
+        $username = $p_dbValues['database']['dbuser'];
+        $password = $p_dbValues['database']['dbpass'];
+        $host = $p_dbValues['database']['host'];
+        $database = $p_dbValues['database']['dbname'];
+        $dir = __DIR__;
+        
+        passthru("export PGPASSWORD=$password && psql -h $host -U $username -q -f $dir/data/upgrade.sql $database 2>&1 | grep -v \"will create implicit index\"");
+    }
+}
diff --git a/install_minimal/upgrades/airtime-2.2.1/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.2.1/airtime-upgrade.php
new file mode 100644
index 000000000..042b92d05
--- /dev/null
+++ b/install_minimal/upgrades/airtime-2.2.1/airtime-upgrade.php
@@ -0,0 +1,8 @@
+<?php
+
+require_once 'DbUpgrade.php';
+
+$filename = "/etc/airtime/airtime.conf";
+$values = parse_ini_file($filename, true);
+
+AirtimeDatabaseUpgrade::start($values);
diff --git a/install_minimal/upgrades/airtime-2.2.1/data/upgrade.sql b/install_minimal/upgrades/airtime-2.2.1/data/upgrade.sql
new file mode 100644
index 000000000..77e8b168b
--- /dev/null
+++ b/install_minimal/upgrades/airtime-2.2.1/data/upgrade.sql
@@ -0,0 +1,9 @@
+DELETE FROM cc_pref WHERE keystr = 'system_version';
+INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.2.1');
+
+ALTER TABLE cc_block
+	DROP CONSTRAINT cc_block_createdby_fkey;
+
+ALTER TABLE cc_block
+	ADD CONSTRAINT cc_block_createdby_fkey FOREIGN KEY (creator_id) REFERENCES cc_subjs(id) ON DELETE CASCADE;
+
diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py
index 5ca176ec2..1b5e9e18c 100644
--- a/python_apps/api_clients/api_client.py
+++ b/python_apps/api_clients/api_client.py
@@ -18,7 +18,7 @@ from configobj import ConfigObj
 import string
 import traceback
 
-AIRTIME_VERSION = "2.2.0"
+AIRTIME_VERSION = "2.2.1"
 
 
 # TODO : Place these functions in some common module. Right now, media