Merge branch '1.2' into 1

.travis.yml

@@ -1,15 +1,23 @@
 language: php
 
+dist: precise
+
 sudo: false
 
 matrix:
   include:
     - php: 5.3
       env: DB=POSTGRESQL CORE_RELEASE=3.4
+    - php: 5.4
+      env: DB=POSTGRESQL CORE_RELEASE=3.5
+    - php: 5.5
+      env: DB=POSTGRESQL CORE_RELEASE=3.6
     - php: 5.6
       env: DB=POSTGRESQL CORE_RELEASE=3
     - php: 7.0
       env: DB=POSTGRESQL CORE_RELEASE=3
+    - php: 7.1
+      env: DB=POSTGRESQL CORE_RELEASE=3
 
 before_script:
  - composer self-update || true

code/PostgreSQLDatabase.php

@@ -149,7 +149,7 @@ class PostgreSQLDatabase extends SS_Database {
 			}
 		}
 
-		// Connect to the actual database we're requesting
+			// Connect to the actual database  we 're requesting
 		$this->connectDefault();
 
 		// Set up the schema if required
@@ -354,12 +354,14 @@ class PostgreSQLDatabase extends SS_Database {
 
 		$fullQuery = "SELECT * FROM (" . implode(" UNION ", $tables) . ") AS q1 $orderBy LIMIT $limit OFFSET $offset";
 
+		// Get the total items in this search
+		$totalItemsQuery = "SELECT COUNT(*) AS totalitems FROM (" . implode(" UNION ", $tables) . ") AS q1";
+		$totalCount = DB::query($totalItemsQuery);
+
 		// Get records
 		$records = $this->preparedQuery($fullQuery, $tableParameters);
-		$totalCount=0;
 		foreach($records as $record){
 			$objects[] = new $record['ClassName']($record);
-			$totalCount++;
 		}
 
 		if(isset($objects)) $results = new ArrayList($objects);
@@ -368,7 +370,7 @@ class PostgreSQLDatabase extends SS_Database {
 		$list->setLimitItems(false);
 		$list->setPageStart($start);
 		$list->setPageLength($pageLength);
-		$list->setTotalItems($totalCount);
+		$list->setTotalItems($totalCount->value());
 		return $list;
 	}
 
@@ -414,6 +416,7 @@ class PostgreSQLDatabase extends SS_Database {
 		$this->query('COMMIT;');
 	}
 
+
 	public function comparisonClause($field, $value, $exact = false, $negate = false, $caseSensitive = null, $parameterised = false) {
 		if($exact && $caseSensitive === null) {
 			$comp = ($negate) ? '!=' : '=';
@@ -422,12 +425,10 @@ class PostgreSQLDatabase extends SS_Database {
 			if($negate) $comp = 'NOT ' . $comp;
 			$field.='::text';
 		}
-
 		if($parameterised) {
 			return sprintf("%s %s ?", $field, $comp);
 		} else {
-			return sprintf("%s %s '%s'", $field, $comp, $value);
+		return sprintf("%s %s '%s'", $field, $comp, $value);}
-		}
 	}
 
 	/**

code/PostgreSQLSchemaManager.php

@@ -464,7 +464,8 @@ class PostgreSQLSchemaManager extends DBSchemaManager {
 			}
 
 			// SET check constraint (The constraint HAS to be dropped)
-			$existing_constraint=$this->query("SELECT conname FROM pg_constraint WHERE conname='{$tableName}_{$colName}_check';")->value();
+			$constraint_name = "{$tableName}_{$colName}_check";
+			$existing_constraint = $this->constraintExists($constraint_name, false);
 			if(isset($matches[4])) {
 				//Take this new constraint and see what's outstanding from the target table:
 				$constraint_bits=explode('(', $matches[4]);
@@ -488,12 +489,12 @@ class PostgreSQLSchemaManager extends DBSchemaManager {
 
 			//First, delete any existing constraint on this column, even if it's no longer an enum
 			if($existing_constraint) {
-				$alterCol .= ",\nDROP CONSTRAINT \"{$tableName}_{$colName}_check\"";
+				$alterCol .= ",\nDROP CONSTRAINT \"{$constraint_name}\"";
 			}
 
 			//Now create the constraint (if we've asked for one)
 			if(!empty($matches[4])) {
-				$alterCol .= ",\nADD CONSTRAINT \"{$tableName}_{$colName}_check\" $matches[4]";
+				$alterCol .= ",\nADD CONSTRAINT \"{$constraint_name}\" $matches[4]";
 			}
 		}
 
@@ -873,15 +874,25 @@ class PostgreSQLSchemaManager extends DBSchemaManager {
 	 * query all over again.
 	 *
 	 * @param string $constraint
+	 * @param bool $cache Flag whether a cached version should be used. Set to false to cache bust.
+	 * @return false|array Either false, if the constraint doesn't exist, or an array
+	 * with the keys conname and pg_get_constraintdef
 	 */
-	protected function constraintExists($constraint){
+	protected function constraintExists($constraint, $cache = true){
-		if(!isset(self::$cached_constraints[$constraint])){
+		if(!$cache || !isset(self::$cached_constraints[$constraint])){
-			$exists = $this->preparedQuery("
+			$value = $this->preparedQuery("
 				SELECT conname,pg_catalog.pg_get_constraintdef(r.oid, true)
-				FROM pg_catalog.pg_constraint r WHERE r.contype = 'c' AND conname = ? ORDER BY 1;",
+				FROM pg_catalog.pg_constraint r
-				array($constraint)
+				INNER JOIN pg_catalog.pg_namespace n
+				  ON r.connamespace = n.oid
+				WHERE r.contype = 'c' AND conname = ? AND n.nspname = ?
+				ORDER BY 1;",
+				array($constraint, $this->database->currentSchema())
 			)->first();
-			self::$cached_constraints[$constraint]=$exists;
+			if (!$cache) {
+				return $value;
+			}
+			self::$cached_constraints[$constraint] = $value;
 		}
 
 		return self::$cached_constraints[$constraint];
@@ -903,10 +914,13 @@ class PostgreSQLSchemaManager extends DBSchemaManager {
 					WHERE c.relname = ? AND pg_catalog.pg_table_is_visible(c.oid) AND n.nspname = ?
 				);";
 
-		$result = $this->preparedQuery($query, $tableName, $this->database->currentSchema());
+		$result = $this->preparedQuery(
+			$query,
+			array($tableName, $this->database->currentSchema())
+		);
 
 		$table = array();
-		while($row = pg_fetch_assoc($result)) {
+		foreach ($result as $row) {
 			$table[] = array(
 				'Column' => $row['Column'],
 				'DataType' => $row['DataType']
@@ -1388,12 +1402,10 @@ class PostgreSQLSchemaManager extends DBSchemaManager {
 				$this->query("CREATE TABLE \"$partition_name\" (CHECK (" . str_replace('NEW.', '', $partition_value) . ")) INHERITS (\"$tableName\")$tableSpace;");
 			} else {
 				//Drop the constraint, we will recreate in in the next line
-				$existing_constraint = $this->preparedQuery(
+				$constraint_name = "{$partition_name}_pkey";
-					"SELECT conname FROM pg_constraint WHERE conname = ?;",
+				$existing_constraint = $this->constraintExists($constraint_name, false);
-					array("{$partition_name}_pkey")
-				);
 				if($existing_constraint){
-					$this->query("ALTER TABLE \"$partition_name\" DROP CONSTRAINT \"{$partition_name}_pkey\";");
+					$this->query("ALTER TABLE \"$partition_name\" DROP CONSTRAINT \"{$constraint_name}\";");
 				}
 				$this->dropTrigger(strtolower('trigger_' . $tableName . '_insert'), $tableName);
 			}

composer.json

@@ -10,7 +10,7 @@
 		}
 	],
 	"require": {
-		"silverstripe/framework": "^3.2.0"
+		"silverstripe/framework": "^3.2"
 	},
 	"extra": {
 		"branch-alias": {