Merge pull request #53 from albertcht/master

[Fix] fix wrong values of type boolean

Author: mavinoo

src/Common/Common.php

@@ -16,6 +16,10 @@ public static function mysql_escape($fieldValue)
  return array_map(__METHOD__, $fieldValue);
  }
 
+ if (is_bool($fieldValue)) {
+ return (int) $fieldValue;
+ }
+
  if (!empty($fieldValue) && is_string($fieldValue)) {
  return str_replace(
  ['\\', "\0", "\n", "\r", "'", '"', "\x1a"],

tests/BatchInsertTest.php

@@ -11,6 +11,7 @@ class BatchInsertTest extends BootstrapDatabase
  'password',
  'name',
  'status',
+ 'is_vip'
  ];
 
  public function testBatchInsertWithFacade()
@@ -20,19 +21,22 @@ public function testBatchInsertWithFacade()
  'djunehor@gmail.com',
  bcrypt('djunehor'),
  'djunehor',
- 'active'
+ 'active',
+ true,
  ],
  [
  'samuel@gmail.com',
  bcrypt('samuel'),
  'samuel',
- 'whodey'
+ 'whodey',
+ false,
  ],
  [
  'general@gmail.com',
  bcrypt('general'),
  'general',
  'inactive',
+ false,
  ]
  ];
  $batchSize = 500; // insert 500 (default), 100 minimum rows in one query
@@ -59,12 +63,13 @@ public function testBatchInsertIncorrectColumnCount()
  'djunehor@gmail.com',
  bcrypt('djunehor'),
  'djunehor',
+ 'active',
  ],
  [
  'samuel@gmail.com',
  bcrypt('samuel'),
  'samuel',
- 'whodey'
+ 'whodey',
  ],
  [
  'general@gmail.com',
@@ -86,19 +91,22 @@ public function testBatchInsertWithHelper()
  'djunehor@gmail.com',
  bcrypt('djunehor'),
  'djunehor',
- 'active'
+ 'active',
+ true,
  ],
  [
  'samuel@gmail.com',
  bcrypt('samuel'),
  'samuel',
- 'whodey'
+ 'whodey',
+ false,
  ],
  [
  'general@gmail.com',
  bcrypt('general'),
  'general',
  'inactive',
+ false,
  ]
  ];
  $batchSize = 500; // insert 500 (default), 100 minimum rows in one query

tests/BatchUpdateTest.php

@@ -12,6 +12,7 @@ class BatchUpdateTest extends BootstrapDatabase
  'password',
  'name',
  'status',
+ 'is_vip',
  ];
 
  private function insert()
@@ -21,19 +22,22 @@ private function insert()
  'djunehor@gmail.com',
  bcrypt('djunehor'),
  'djunehor',
- 'active'
+ 'active',
+ true,
  ],
  [
  'samuel@gmail.com',
  bcrypt('samuel'),
  'samuel',
- 'whodey'
+ 'whodey',
+ false,
  ],
  [
  'general@gmail.com',
  bcrypt('general'),
  'general',
  'inactive',
+ false,
  ]
  ];
  $batchSize = 500; // insert 500 (default), 100 minimum rows in one query
@@ -51,7 +55,8 @@ public function testBatchUpdateWithFacade()
  $columnValues = [
  [
  'id' => 1,
- 'status' => 'amala'
+ 'name' => 'amala',
+ 'is_vip' => false
  ],
  [
  'id' => 2,
@@ -68,7 +73,12 @@ public function testBatchUpdateWithFacade()
 
  $result = Batch::update($this->model, $columnValues, $index);
 
+ $member = $this->model->findOrFail(1);
+
  $this->assertTrue($result === 3);
+ $this->assertEquals('amala', $member->name);
+ $this->assertFalse($member->is_vip);
+
  $this->model->truncate();
  }
 
@@ -78,7 +88,8 @@ public function testBatchUpdateWithHelper()
  $columnValues = [
  [
  'id' => 1,
- 'status' => 'amala'
+ 'name' => 'amala',
+ 'is_vip' => false
  ],
  [
  'id' => 2,
@@ -95,7 +106,12 @@ public function testBatchUpdateWithHelper()
 
  $result = batch()->update($this->model, $columnValues, $index);
 
+ $member = $this->model->findOrFail(1);
+
  $this->assertTrue($result === 3);
+ $this->assertEquals('amala', $member->name);
+ $this->assertFalse($member->is_vip);
+
  $this->model->truncate();
  }
 }

tests/TestModel.php

@@ -4,6 +4,10 @@ class TestModel extends \Illuminate\Database\Eloquent\Model
 {
  protected $table = 'HmKTjCJgLN9bBq7KXzI3';
 
+ protected $casts = [
+ 'is_vip' => 'boolean'
+ ];
+
  /**
  * Get name of the table.
  *