Merge pull request #6 from ootatter/datetime_sec

add datetime validation rule regex date time sec for date time fields.

Author: ichikaway

Model/Behavior/AddValidationRuleBehavior.php

@@ -364,7 +364,7 @@ public function datetime(Model $model, $wordvalue, $format = 'ymd', $regex = nul
 
 		$value = array_shift($wordvalue);
 
-		$pattern = '%^(.+) (\d+:\d+[APap][Mm])$|^(.+) (\d+:\d+)$%';
+		$pattern = '%^(.+) (\d+:\d+[APap][Mm])$|^(.+) (\d+:\d+|\d+:\d+:\d+)$%';
 		preg_match($pattern, $value, $match);
 		if(!empty($match[1]) && !empty($match[2])) {
 			$date = $match[1];

Test/Case/Model/Behavior/AddValidationRuleTest.php

@@ -434,5 +434,20 @@ function testDatetimeYyyymmdd() {
 
 	}
 
+	function testDateTimeField(){
+		$data = array(
+			'ValidationRule' => array(
+				'datetime_valid'=>array(
+					'year'	=>	'2013',
+					'month'	=>	'01',
+					'day'	=>	'24',
+				)
+			),
+		);
+		$this->ValidationRule->create( $data );
+		$this->assertTrue( $this->ValidationRule->validates() );
+		$this->assertEquals('2013-01-24 00:00:00',$this->ValidationRule->data['ValidationRule']['datetime_valid']);
+	}
+
 
 }

Test/Fixture/ValidationRuleFixture.php

@@ -17,7 +17,7 @@ class ValidationRuleFixture extends CakeTestFixture {
                         'telFaxJp' => array('type' => 'text', 'null' => true, 'default' => NULL, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
                         'mobileEmailJp' => array('type' => 'text', 'null' => true, 'default' => NULL, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
                         'passwordValid' => array('type' => 'text', 'null' => true, 'default' => NULL, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
-                        'datetime_valid' => array('type' => 'text', 'null' => true, 'default' => NULL, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
+                        'datetime_valid' => array('type' => 'datetime', 'null' => true, 'default' => NULL),
                         );
 
     var $records = array(