From 82b445436330ec15a7675a0db21bcc7ffedf0a93 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Mon, 3 Dec 2012 11:07:47 -0500
Subject: [PATCH] merge from devel

---
 .../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 +++++++
 3 files changed, 41 insertions(+)
 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/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;
+