Browse Source

remove `numeric` from `unsigned` config

imsamurai 12 years ago
parent
commit
00fb663f90

+ 1 - 1
lib/Cake/Model/Datasource/Database/Mysql.php

@@ -91,7 +91,7 @@ class Mysql extends DboSource {
 			'value' => 'UNSIGNED', 'quote' => false, 'join' => ' ', 'column' => false, 'position' => 'beforeDefault',
 			'noVal' => true,
 			'options' => array(true),
-			'types' => array('integer', 'float', 'biginteger', 'numeric', 'decimal')
+			'types' => array('integer', 'float', 'decimal', 'biginteger')
 		)
 	);
 

+ 2 - 11
lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php

@@ -3248,7 +3248,7 @@ class MysqlTest extends CakeTestCase {
 			array(
 				array(
 					'name' => 'testName',
-					'type' => 'numeric',
+					'type' => 'decimal',
 					'unsigned' => true
 				),
 				'`testName` decimal UNSIGNED'
@@ -3257,20 +3257,11 @@ class MysqlTest extends CakeTestCase {
 			array(
 				array(
 					'name' => 'testName',
-					'type' => 'numeric',
+					'type' => 'decimal',
 					'unsigned' => true,
 					'default' => 1
 				),
 				'`testName` decimal UNSIGNED DEFAULT 1'
-			),
-			//set #8
-			array(
-				array(
-					'name' => 'testName',
-					'type' => 'decimal',
-					'unsigned' => true
-				),
-				'`testName` decimal UNSIGNED'
 			)
 		);
 	}