Explicit Support for PG 9.5

5 files changed, 49 insertions, 5 deletions

diff --git a/classes/database/Connection.php b/classes/database/Connection.php
index 3a3e3d05..f20b47fa 100755
--- a/classes/database/Connection.php
+++ b/classes/database/Connection.php
@@ -76,7 +76,8 @@ class Connection {
 
 		// Detect version and choose appropriate database driver
 		switch (substr($version,0,3)) {
-			case '9.4': return 'Postgres'; break;
+                        case '9.5': return 'Postgres'; break;
+			case '9.4': return 'Postgres94'; break;
 			case '9.3': return 'Postgres93'; break;
 			case '9.2': return 'Postgres92'; break;
 			case '9.1': return 'Postgres91'; break;
diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index d01906bf..7b3b8f53 100755
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -11,7 +11,7 @@ include_once('./classes/database/ADODB_base.php');
 
 class Postgres extends ADODB_base {
 
-	var $major_version = 9.4;
+	var $major_version = 9.5;
 	// Max object name length
 	var $_maxNameLen = 63;
 	// Store the current schema
@@ -419,7 +419,7 @@ class Postgres extends ADODB_base {
 	}
 
 	function getHelpPages() {
-		include_once('./help/PostgresDoc94.php');
+		include_once('./help/PostgresDoc95.php');
 		return $this->help_page;
 	}
 
diff --git a/classes/database/Postgres93.php b/classes/database/Postgres93.php
index bcf7e411..24ee22d6 100644
--- a/classes/database/Postgres93.php
+++ b/classes/database/Postgres93.php
@@ -5,9 +5,9 @@
  *
  */
 
-include_once('./classes/database/Postgres.php');
+include_once('./classes/database/Postgres94.php');
 
-class Postgres93 extends Postgres {
+class Postgres93 extends Postgres94 {
 
 	var $major_version = 9.3;
 
diff --git a/classes/database/Postgres94.php b/classes/database/Postgres94.php
new file mode 100644
index 00000000..619b238b
--- /dev/null
+++ b/classes/database/Postgres94.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * PostgreSQL 9.4 support
+ *
+ */
+
+include_once('./classes/database/Postgres.php');
+
+class Postgres94 extends Postgres {
+
+	var $major_version = 9.4;
+
+	/**
+	 * Constructor
+	 * @param $conn The database connection
+	 */
+	function Postgres94($conn) {
+		$this->Postgres($conn);
+	}
+
+	// Help functions
+
+	function getHelpPages() {
+		include_once('./help/PostgresDoc94.php');
+		return $this->help_page;
+	}
+
+}
+?>
diff --git a/help/PostgresDoc95.php b/help/PostgresDoc95.php
new file mode 100644
index 00000000..5ef261ab
--- /dev/null
+++ b/help/PostgresDoc95.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * Help links for PostgreSQL 9.5 documentation
+ *
+ * $Id: PostgresDoc84.php,v 1.3 2008/11/18 21:35:48 ioguix Exp $
+ */
+
+include('./help/PostgresDoc94.php');
+
+$this->help_base = sprintf($GLOBALS['conf']['help_base'], '9.5');
+
+?>