refs # 7929 refactor uuid support to not break Backward Compatibility

cakephp · Jan 15, 2016 · 47bf98c · 47bf98c
1 parent 66f3a7e
commit 47bf98c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/lib/Cake/Model/Datasource/Database/Postgres.php b/lib/Cake/Model/Datasource/Database/Postgres.php
@@ -217,6 +217,7 @@ public function describe($model) {
 						$length = null;
 						$type = 'text';
 					} elseif ($c->type === 'uuid') {
+						$type = 'uuid';
 						$length = 36;
 					} else {
 						$length = (int)$c->oct_length;
@@ -242,7 +243,10 @@ public function describe($model) {
 				if ($model instanceof Model) {
 					if ($c->name === $model->primaryKey) {
 						$fields[$c->name]['key'] = 'primary';
-						if ($fields[$c->name]['type'] !== 'string') {
+						if (
+							$fields[$c->name]['type'] !== 'string' &&
+							$fields[$c->name]['type'] !== 'uuid'
+						) {
 							$fields[$c->name]['length'] = 11;
 						}
 					}
@@ -699,8 +703,10 @@ public function column($real) {
 				return 'biginteger';
 			case (strpos($col, 'int') !== false && $col !== 'interval'):
 				return 'integer';
-			case (strpos($col, 'char') !== false || $col === 'uuid'):
+			case (strpos($col, 'char') !== false):
 				return 'string';
+			case (strpos($col, 'uuid') !== false):
+				return 'uuid';
 			case (strpos($col, 'text') !== false):
 				return 'text';
 			case (strpos($col, 'bytea') !== false):

diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php
@@ -344,12 +344,13 @@ public function value($data, $column = null, $null = true) {
 				return $this->_connection->quote($data, PDO::PARAM_LOB);
 			case 'boolean':
 				return $this->_connection->quote($this->boolean($data, true), PDO::PARAM_BOOL);
-			case 'string':
+			case 'uuid':
 				if ($data === '') {
 					return 'NULL';
 				} else {
 					return $this->_connection->quote($data, PDO::PARAM_STR);
 				}
+			case 'string':
 			case 'text':
 				return $this->_connection->quote($data, PDO::PARAM_STR);
 			default:

diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php
@@ -1982,7 +1982,7 @@ protected function _doSave($data = null, $options = array()) {
  */
 	protected function _isUUIDField($field) {
 		$field = $this->schema($field);
-		return $field['length'] == 36 && in_array($field['type'], array('string', 'binary'));
+		return $field['length'] == 36 && in_array($field['type'], array('string', 'binary', 'uuid'));
 	}
 
 /**