Merge pull request #20 from sizuhiko/hotfix/issue19

support char(1) that is not varchar for issue #19
sizuhiko · Feb 13, 2016 · a2a136b · a2a136b
2 parents 82387a6 + 02de557
commit a2a136b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,6 +14,9 @@ env:
   matrix:
     - DB=mysql CAKE_VERSION=2.4
     - DB=mysql CAKE_VERSION=2.5
+    - DB=mysql CAKE_VERSION=2.6
+    - DB=mysql CAKE_VERSION=2.7
+    - DB=mysql CAKE_VERSION=2.8
 
 matrix:
   include:

diff --git a/Lib/Factory/FabricateModelFactory.php b/Lib/Factory/FabricateModelFactory.php
@@ -74,7 +74,9 @@ protected function fakeRecord($tableInfo, $index) {
 					} else {
 						$insert = "Lorem ipsum dolor sit amet";
 						if (!empty($fieldInfo['length'])) {
-							$insert = substr($insert, 0, (int)$fieldInfo['length'] - 2);
+							$length = (int)$fieldInfo['length'];
+							$length = $length === 1? $length : ($length - 2);
+							$insert = substr($insert, 0, $length);
 						}
 					}
 					break;

diff --git a/Test/Case/Lib/FabricateTest.php b/Test/Case/Lib/FabricateTest.php
@@ -45,7 +45,7 @@ public function testAttributesFor() {
 			"author_id"=>5, 
 			"title"=>"Lorem ipsum dolor sit amet",
 			"body"=>"Lorem ipsum dolor sit amet, aliquet feugiat. Convallis morbi fringilla gravida, phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla vestibulum massa neque ut et, id hendrerit sit, feugiat in taciti enim proin nibh, tempor dignissim, rhoncus duis vestibulum nunc mattis convallis.",
-			"published"=>"Lorem ipsum dolor sit ame",
+			"published"=>"L",
 			"created"=>"2013-10-09 12:40:28",
 			"updated"=>"2013-10-09 12:40:28"
 		];
@@ -62,7 +62,7 @@ public function testBuild() {
 			"author_id"=>1, 
 			"title"=>"Lorem ipsum dolor sit amet",
 			"body"=>"Lorem ipsum dolor sit amet, aliquet feugiat. Convallis morbi fringilla gravida, phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla vestibulum massa neque ut et, id hendrerit sit, feugiat in taciti enim proin nibh, tempor dignissim, rhoncus duis vestibulum nunc mattis convallis.",
-			"published"=>"Lorem ipsum dolor sit ame",
+			"published"=>"L",
 			"created"=>"2013-10-09 12:40:28",
 			"updated"=>"2013-10-09 12:40:28"
 		];
@@ -97,7 +97,7 @@ public function testAttributesForWithArrayOption() {
 			"author_id"=>5, 
 			"title"=>"Lorem ipsum dolor sit amet",
 			"body"=>"Lorem ipsum dolor sit amet, aliquet feugiat. Convallis morbi fringilla gravida, phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla vestibulum massa neque ut et, id hendrerit sit, feugiat in taciti enim proin nibh, tempor dignissim, rhoncus duis vestibulum nunc mattis convallis.",
-			"published"=>"Lorem ipsum dolor sit ame",
+			"published"=>"L",
 			"created"=>"2013-10-09 12:40:28",
 			"updated"=>"2013-10-09 12:40:28"
 		];
@@ -112,7 +112,7 @@ public function testBuildWithArrayOption() {
 			"author_id"=>1, 
 			"title"=>"Lorem ipsum dolor sit amet",
 			"body"=>"Lorem ipsum dolor sit amet, aliquet feugiat. Convallis morbi fringilla gravida, phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla vestibulum massa neque ut et, id hendrerit sit, feugiat in taciti enim proin nibh, tempor dignissim, rhoncus duis vestibulum nunc mattis convallis.",
-			"published"=>"Lorem ipsum dolor sit ame",
+			"published"=>"L",
 			"created"=>"2013-10-09 12:40:28",
 			"updated"=>"2013-10-09 12:40:28"
 		];