From 2032eefdde689a66b340806c61cb82d12806599e Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Mon, 9 Dec 2013 15:30:30 -0500
Subject: [PATCH] Update version number in airtime-constants.php Update version
 number in api_client.py Create upgrade folder

---
 install_minimal/include/airtime-constants.php |  2 +-
 .../upgrades/airtime-2.5.1/DbUpgrade.php      | 24 +++++++++++++++++++
 .../airtime-2.5.1/airtime-upgrade.php         |  8 +++++++
 .../upgrades/airtime-2.5.1/data/upgrade.sql   |  2 ++
 python_apps/api_clients/api_client.py         |  2 +-
 5 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 install_minimal/upgrades/airtime-2.5.1/DbUpgrade.php
 create mode 100644 install_minimal/upgrades/airtime-2.5.1/airtime-upgrade.php
 create mode 100644 install_minimal/upgrades/airtime-2.5.1/data/upgrade.sql

diff --git a/install_minimal/include/airtime-constants.php b/install_minimal/include/airtime-constants.php
index 61408912c..2a3bf95ee 100644
--- a/install_minimal/include/airtime-constants.php
+++ b/install_minimal/include/airtime-constants.php
@@ -1,3 +1,3 @@
 <?php
 
-define('AIRTIME_VERSION', '2.5.0');
+define('AIRTIME_VERSION', '2.5.1');
diff --git a/install_minimal/upgrades/airtime-2.5.1/DbUpgrade.php b/install_minimal/upgrades/airtime-2.5.1/DbUpgrade.php
new file mode 100644
index 000000000..dbfef98c5
--- /dev/null
+++ b/install_minimal/upgrades/airtime-2.5.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.5.1/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.5.1/airtime-upgrade.php
new file mode 100644
index 000000000..042b92d05
--- /dev/null
+++ b/install_minimal/upgrades/airtime-2.5.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.5.1/data/upgrade.sql b/install_minimal/upgrades/airtime-2.5.1/data/upgrade.sql
new file mode 100644
index 000000000..046351e8b
--- /dev/null
+++ b/install_minimal/upgrades/airtime-2.5.1/data/upgrade.sql
@@ -0,0 +1,2 @@
+DELETE FROM cc_pref WHERE keystr = 'system_version';
+INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.5.1');
diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py
index e47336d25..1ea188698 100644
--- a/python_apps/api_clients/api_client.py
+++ b/python_apps/api_clients/api_client.py
@@ -16,7 +16,7 @@ import base64
 import traceback
 from configobj import ConfigObj
 
-AIRTIME_VERSION = "2.5.0"
+AIRTIME_VERSION = "2.5.1"
 
 
 # TODO : Place these functions in some common module. Right now, media