Skip to content

Commit f56d6a2

Browse files
authored
Merge pull request #23 from sartor/master
Invalid date (1970-01-01) fix in migration table
2 parents 4ac95e4 + 57e6ec0 commit f56d6a2

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

console/controllers/MigrateController.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -122,25 +122,25 @@ protected function getMigrationHistory($limit)
122122
*/
123123
protected function addMigrationHistory($version)
124124
{
125-
$command = $this->db->createCommand();
126-
$command->insert($this->migrationTable, [
127-
'version' => $version,
128-
'apply_time' => time(),
129-
'is_deleted' => 0
130-
])->execute();
125+
$this->insertHistory($version);
131126
}
132127

133128
/**
134129
* @inheritdoc
135130
*/
136131
protected function removeMigrationHistory($version)
137132
{
138-
$command = $this->db->createCommand();
139-
$command->insert($this->migrationTable, [
133+
$this->insertHistory($version, true);
134+
}
135+
136+
private function insertHistory(string $version, bool $isDelete = false): void
137+
{
138+
$time = time();
139+
$this->db->createCommand()->insert($this->migrationTable, [
140140
'version' => $version,
141-
'apply_time' => time(),
142-
'is_deleted' => 1
141+
'date' => date('Y-m-d', $time),
142+
'apply_time' => $time,
143+
'is_deleted' => (int) $isDelete
143144
])->execute();
144145
}
145-
146146
}

tests/SchemaBuilderTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,9 @@ public function testDefaultExpression()
229229
$this->assertEquals(1, $createResult);
230230

231231
$expected = [
232-
['default_kind' => 'DEFAULT', 'default_expression' => "CAST(100, 'Int32')"],
233-
['default_kind' => 'DEFAULT', 'default_expression' => "CAST(100, 'Nullable(UInt32)')"],
234-
['default_kind' => 'DEFAULT', 'default_expression' => "CAST('qweasdzxc1', 'Nullable(FixedString(10))')"],
232+
['default_kind' => 'DEFAULT', 'default_expression' => "100"],
233+
['default_kind' => 'DEFAULT', 'default_expression' => "100"],
234+
['default_kind' => 'DEFAULT', 'default_expression' => "'qweasdzxc1'"],
235235
['default_kind' => 'DEFAULT', 'default_expression' => "'str1'"],
236236
['default_kind' => 'DEFAULT', 'default_expression' => "concat('str1', 'str2')"],
237237
['default_kind' => 'DEFAULT', 'default_expression' => "today()"],
@@ -258,10 +258,10 @@ public function testDefaultValue()
258258
$this->assertEquals(1, $createResult);
259259

260260
$expected = [
261-
['default_kind' => 'DEFAULT', 'default_expression' => "CAST('100', 'Int32')"],
262-
['default_kind' => 'DEFAULT', 'default_expression' => "CAST(100, 'Int32')"],
263-
['default_kind' => 'DEFAULT', 'default_expression' => "CAST(100, 'Nullable(UInt32)')"],
264-
['default_kind' => 'DEFAULT', 'default_expression' => "CAST('qweasdzxc1', 'Nullable(FixedString(10))')"],
261+
['default_kind' => 'DEFAULT', 'default_expression' => "'100'"],
262+
['default_kind' => 'DEFAULT', 'default_expression' => "100"],
263+
['default_kind' => 'DEFAULT', 'default_expression' => "100"],
264+
['default_kind' => 'DEFAULT', 'default_expression' => "'qweasdzxc1'"],
265265
['default_kind' => 'DEFAULT', 'default_expression' => "'str1'"],
266266
];
267267

0 commit comments

Comments
 (0)