Fix false defaults (#75)

Author: bajb

src/Ql/Cql/CqlDataStore.php

@@ -117,8 +117,8 @@ protected function _assemble(IStatement $statement, $forPrepare = true)
 
   protected function _getInsertData(QlDao $dao)
   {
-    $initial = $dao->isDaoLoaded() ? [] : array_filter($dao->getDefaultDaoValues());
-    $changes = array_merge($initial, $this->_getDaoChanges($dao));
+    $init = $dao->isDaoLoaded() ? [] : array_filter($dao->getDefaultDaoValues(), function ($v) { return $v !== null; });
+    $changes = array_merge($init, $this->_getDaoChanges($dao));
     foreach($dao->getDaoIDProperties() as $prop)
     {
       if(!isset($changes[$prop]))

tests/Ql/Cql/CqlTest.php

@@ -535,8 +535,8 @@ public function testAlwaysInsertIDWithPrefil()
       [
         [
           'runQuery',
-          'INSERT INTO "mock_ql_daos" ("intVal", "id", "id2", "username") VALUES (?, ?, ?, ?)',
-          [1, $dao->id, 12345, 'abc'],
+          'INSERT INTO "mock_ql_daos" ("intVal", "boolVal", "id", "id2", "username") VALUES (?, ?, ?, ?, ?)',
+          [1, false, $dao->id, 12345, 'abc'],
         ],
       ],
       $connection->getQueries()

tests/Ql/Cql/Mocks/MockPrefillCqlDao.php

@@ -4,4 +4,5 @@
 class MockPrefillCqlDao extends MockCqlDao
 {
   public $intVal = 1;
+  public $boolVal = false;
 }