leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #322 from tsdogs/issue314

Browse Source 
First try to fix boolean defaultValue #314
This commit is contained in:
Antonio Ramirez
2019-06-28 20:52:43 +02:00
committed by GitHub
parent e5267510b0 c963b9461f
commit 7b311f83e8
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/User/Helper/MigrationHelper.php
View File

@ -71,4 +71,12 @@ class MigrationHelper
{ {
return self::resolveDbType($driverName) === 'sqlsrv'; return self::resolveDbType($driverName) === 'sqlsrv';
} }
public static function getBooleanValue($driverName,$value=false)
{
if(self::isMicrosoftSQLServer($driverName)) {
return $value? 1: 0;
}
return $value;
}
} }

3
src/User/Migration/m000000_000006_add_two_factor_fields.php
View File

@ -12,13 +12,14 @@
namespace Da\User\Migration; namespace Da\User\Migration;
use yii\db\Migration; use yii\db\Migration;
use Da\User\Helper\MigrationHelper;
class m000000_000006_add_two_factor_fields extends Migration class m000000_000006_add_two_factor_fields extends Migration
{ {
public function safeUp() public function safeUp()
{ {
$this->addColumn('{{%user}}', 'auth_tf_key', $this->string(16)); $this->addColumn('{{%user}}', 'auth_tf_key', $this->string(16));
$this->addColumn('{{%user}}', 'auth_tf_enabled', $this->boolean()->defaultValue(0)); $this->addColumn('{{%user}}', 'auth_tf_enabled', $this->boolean()->defaultValue(MigrationHelper::getBooleanValue($this->db->driverName,false)));
} }
public function safeDown() public function safeDown()

5
src/User/Migration/m000000_000009_add_gdpr_consent_fields.php
View File

@ -12,14 +12,15 @@
namespace Da\User\Migration; namespace Da\User\Migration;
use yii\db\Migration; use yii\db\Migration;
use Da\User\Helper\MigrationHelper;
class m000000_000009_add_gdpr_consent_fields extends Migration class m000000_000009_add_gdpr_consent_fields extends Migration
{ {
public function safeUp() public function safeUp()
{ {
$this->addColumn('{{%user}}', 'gdpr_consent', $this->boolean()->defaultValue(false)); $this->addColumn('{{%user}}', 'gdpr_consent', $this->boolean()->defaultValue(MigrationHelper::getBooleanValue($this->db->driverName,false)));
$this->addColumn('{{%user}}', 'gdpr_consent_date', $this->integer(11)->null()); $this->addColumn('{{%user}}', 'gdpr_consent_date', $this->integer(11)->null());
$this->addColumn('{{%user}}', 'gdpr_deleted', $this->boolean()->defaultValue(false)); $this->addColumn('{{%user}}', 'gdpr_deleted', $this->boolean()->defaultValue(MigrationHelper::getBooleanValue($this->db->driverName,false)));
} }
public function safeDown() public function safeDown()