#75 Add Uuid support

core/Base/Assert.class.php

@@ -276,6 +276,30 @@ public static function isUnreachable($message = 'unreachable code reached')
 		{
 			throw new WrongArgumentException($message);
 		}
+
+		/**
+		 * Checking UUID
+		 * @see http://tools.ietf.org/html/rfc4122
+		 * @param string $value
+		 * @return boolean
+		 */
+		public static function checkUuid($value)
+		{
+			return (
+				is_string($value) &&
+				preg_match(PrimitiveUuid::UUID_PATTERN, $value)
+			);
+		}
+
+		public static function isUuid($variable, $message = null)
+		{
+			if(
+				!self::checkUuid($variable)
+			)
+				throw new WrongArgumentException(
+					$message.', '.self::dumpArgument($variable)
+				);
+		}
 
 		/// exceptionless methods
 		//@{

core/DB/PgSQL.class.php

@@ -77,11 +77,23 @@ public function isConnected()
 
 		public function obtainSequence($sequence)
 		{
+			if($sequence === 'uuid')
+				return $this->obtainUuid();
+
 			$res = $this->queryRaw("select nextval('{$sequence}') as seq");
 			$row = pg_fetch_assoc($res);
 			pg_free_result($res);
 			return $row['seq'];
 		}
+
+
+		/**
+		 * @return string
+		 */
+		public function obtainUuid()
+		{
+			return UuidUtils::make();
+		}
 
 		/**
 		 * @return PgSQL

core/Exceptions/UnsupportedExtensionException.class.php

@@ -0,0 +1,16 @@
+<?php
+/***************************************************************************
+ *   Copyright (C) 2012 by Georgiy T. Kutsurua                             *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License as        *
+ *   published by the Free Software Foundation; either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ ***************************************************************************/
+
+	/**
+	 * @ingroup Exceptions
+	**/
+
+	class UnsupportedExtensionException extends BaseException {/*_*/}

core/Form/Primitive.class.php

@@ -362,5 +362,35 @@ public static function ipRange($name)
 		{
 			return new PrimitiveIpRange($name);
 		}
+
+		/**
+		 * @static
+		 * @param $name
+		 * @return PrimitiveUuid
+		 */
+		public static function uuid($name)
+		{
+			return new PrimitiveUuid($name);
+		}
+
+		/**
+		 * @static
+		 * @param $name
+		 * @return PrimitiveUuidIdentifier
+		 */
+		public static function uuidIdentifier($name)
+		{
+			return new PrimitiveUuidIdentifier($name);
+		}
+
+		/**
+		 * @static
+		 * @param $name
+		 * @return PrimitiveUuidIdentifierList
+		 */
+		public static function uuidIdentifierList($name)
+		{
+			return new PrimitiveUuidIdentifierList($name);
+		}
 	}
 ?>

core/Form/Primitives/PrimitiveIdentifierList.class.php

@@ -12,11 +12,11 @@
 	/**
 	 * @ingroup Primitives
 	**/
-	final class PrimitiveIdentifierList extends PrimitiveIdentifier
+	class PrimitiveIdentifierList extends PrimitiveIdentifier
 	{
 		protected $value = array();
 		private $ignoreEmpty = false;
-		
+
 		/**
 		 * @return PrimitiveIdentifierList
 		**/

core/Form/Primitives/PrimitiveUuid.class.php

@@ -0,0 +1,33 @@
+<?php
+/***************************************************************************
+ *   Copyright (C) 2012 by Georgiy T. Kutsurua                             *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License as        *
+ *   published by the Free Software Foundation; either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ ***************************************************************************/
+
+	/**
+	 * @ingroup Primitives
+	**/
+	class PrimitiveUuid extends PrimitiveString
+	{
+		const UUID_PATTERN = '/^\{?[0-9a-f]{8}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?[0-9a-f]{12}\}?$/i';
+
+		/**
+		 * @param string $name
+		 * @return PrimitiveUuid
+		 */
+		public static function create($name)
+		{
+			return new self($name);
+		}
+
+		public function __construct($name)
+		{
+			parent::__construct($name);
+			$this->setAllowedPattern(self::UUID_PATTERN);
+		}
+	}

core/Form/Primitives/PrimitiveUuidIdentifier.class.php

@@ -0,0 +1,28 @@
+<?php
+/***************************************************************************
+ *   Copyright (C) 2012 by Georgiy T. Kutsurua                             *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License as        *
+ *   published by the Free Software Foundation; either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ ***************************************************************************/
+
+	/**
+	 * @ingroup Primitives
+	**/
+	class PrimitiveUuidIdentifier extends PrimitiveIdentifier
+	{
+
+		protected function checkNumber($number)
+		{
+			Assert::isUuid($number);
+		}
+
+		protected function castNumber($number)
+		{
+			return $number;
+		}
+
+	}

core/Form/Primitives/PrimitiveUuidIdentifierList.class.php

@@ -0,0 +1,27 @@
+<?php
+/***************************************************************************
+ *   Copyright (C) 2012 by Georgiy T. Kutsurua                             *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License as        *
+ *   published by the Free Software Foundation; either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ ***************************************************************************/
+
+	/**
+	 * @ingroup Primitives
+	**/
+	class PrimitiveUuidIdentifierList extends PrimitiveIdentifierList
+	{
+
+		protected function checkNumber($number)
+		{
+			Assert::isUuid($number);
+		}
+
+		protected function castNumber($number)
+		{
+			return $number;
+		}
+	}

core/OSQL/DataType.class.php

@@ -34,6 +34,7 @@ final class DataType extends Enumeration implements DialectString
 		const TIME				= 0x000A0C;
 		const TIMESTAMP			= 0x000A0D;
 		const INTERVAL			= 0x00000F;
+		const UUID				= 0x000005;
 
 		const BINARY			= 0x00000E;
 
@@ -73,6 +74,7 @@ final class DataType extends Enumeration implements DialectString
 			self::TIME			=> 'TIME',
 			self::TIMESTAMP		=> 'TIMESTAMP',
 			self::INTERVAL		=> 'INTERVAL',
+			self::UUID			=> 'UUID',
 
 			self::BINARY		=> 'BINARY',
 

main/Base/LightMetaProperty.class.php

@@ -137,6 +137,7 @@ public static function fill(
 					($type == 'identifier') // obsoleted
 					|| ($type == 'integerIdentifier')
 					|| ($type == 'scalarIdentifier')
+					|| ($type == 'uuidIdentifier')
 				);
 
 			return $property;

main/Utils/UuidUtils.class.php

@@ -0,0 +1,41 @@
+<?php
+/***************************************************************************
+ *   Copyright (C) 2012 by Georgiy T. Kutsurua                             *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License as        *
+ *   published by the Free Software Foundation; either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ ***************************************************************************/
+
+	/**
+	 * @ingroup Utils
+	**/
+	class UuidUtils extends StaticFactory
+	{
+
+		/**
+		 * @static
+		 * @return bool
+		 */
+		public static function isExtensionLoaded()
+		{
+			return extension_loaded('uuid');
+		}
+
+		/**
+		 * @static
+		 * @param $type
+		 * @return string
+		 * @throws UnsupportedExtensionException
+		 */
+		public static function make($type=UUID_TYPE_TIME)
+		{
+			if(!static::isExtensionLoaded() )
+				throw new UnsupportedExtensionException('uuid is unloaded, but it needed!');
+
+			return uuid_create($type);
+		}
+
+	}

meta/builders/BaseBuilder.class.php

@@ -24,6 +24,11 @@ protected static function buildPointers(MetaClass $class)
 			$out = null;
 
 			if (!$class->getPattern() instanceof AbstractClassPattern) {
+				$sequenceName = $class->getTableName().'_id';
+
+				if($class->getIdentifier()->getType() instanceof UuidType)
+					$sequenceName = 'uuid';
+
 				if (
 					$class->getIdentifier()->getColumnName() !== 'id'
 				) {
@@ -49,7 +54,7 @@ public function getObjectName()
 
 public function getSequence()
 {
-	return '{$class->getTableName()}_id';
+	return '{$sequenceName}';
 }
 EOT;
 			} elseif ($class->getWithInternalProperties()) {

meta/classes/MetaClassProperty.class.php

@@ -328,6 +328,9 @@ public function toLightProperty(MetaClass $holder)
 				if ($this->getType() instanceof IntegerType) {
 					$primitiveName = 'integerIdentifier';
 					$className = $holder->getName();
+				} elseif ($this->getType() instanceof UuidType) {
+					$primitiveName = 'uuidIdentifier';
+					$className = $holder->getName();
 				} elseif ($this->getType() instanceof StringType) {
 					$primitiveName = 'scalarIdentifier';
 					$className = $holder->getName();
@@ -348,6 +351,8 @@ public function toLightProperty(MetaClass $holder)
 				) {
 					if ($identifier->getType() instanceof IntegerType) {
 						$primitiveName = 'integerIdentifier';
+					} elseif ($identifier->getType() instanceof UuidType) {
+						$primitiveName = 'uuidIdentifier';
 					} elseif ($identifier->getType() instanceof StringType) {
 						$primitiveName = 'scalarIdentifier';
 					} else

meta/types/UuidType.class.php

@@ -0,0 +1,57 @@
+<?php
+/***************************************************************************
+ *   Copyright (C) 2012 by Georgiy T. Kutusurua                            *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License as        *
+ *   published by the Free Software Foundation; either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ ***************************************************************************/
+
+	/**
+	 * @ingroup Types
+	**/
+	class UuidType extends StringType
+	{
+
+		public function getPrimitiveName()
+		{
+			return 'uuid';
+		}
+
+		/**
+		 * @throws WrongArgumentException
+		 * @return UuidType
+		**/
+		public function setDefault($default)
+		{
+			Assert::isUuid(
+				$default,
+				"strange default value given - '{$default}'"
+			);
+
+			$this->default = $default;
+
+			return $this;
+		}
+
+		public function getDeclaration()
+		{
+			if ($this->hasDefault())
+				return $this->default;
+
+			return 'null';
+		}
+
+		public function isMeasurable()
+		{
+			return false;
+		}
+
+		public function toColumnType()
+		{
+			return 'DataType::create(DataType::UUID)';
+		}
+	}
+?>