Skip to content

Support Cake\I18n\Date and DateTime for inserts #2348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MasterOdin merged 11 commits into from
Apr 17, 2025
Merged

Support Cake\I18n\Date and DateTime for inserts #2348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
58e8476
Fix Date/Datetime seeding
dereuromark Apr 11, 2025
f417ac6
Merge branch '0.x' into dereuromark-patch-1
MasterOdin Apr 15, 2025
a6c40a3
Update composer.json
MasterOdin Apr 15, 2025
b5ecfb7
Add test case (#2351)
dereuromark Apr 16, 2025
c9aca99
rework tests
MasterOdin Apr 17, 2025
b9d7809
fix sqlite test
MasterOdin Apr 17, 2025
3927ee4
use more precise testing
MasterOdin Apr 17, 2025
742dce6
use assertEquals
MasterOdin Apr 17, 2025
8909615
Include milliseconds in sqlserver test
MasterOdin Apr 17, 2025
8675429
add support for regular inserts
MasterOdin Apr 17, 2025
ea14677
Rename variable
MasterOdin Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"ext-json": "*",
"ext-pdo": "*",
"cakephp/cakephp-codesniffer": "^5.0",
"cakephp/i18n": "^5.0",
"phpunit/phpunit": "^9.5.19",
"symfony/yaml": "^3.4|^4.0|^5.0|^6.0|^7.0"
},
Expand Down
53 changes: 33 additions & 20 deletions src/Phinx/Db/Adapter/PdoAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
use Cake\Database\Query\InsertQuery;
use Cake\Database\Query\SelectQuery;
use Cake\Database\Query\UpdateQuery;
use Cake\I18n\Date;
use Cake\I18n\DateTime;
use InvalidArgumentException;
use PDO;
use PDOException;
Expand Down Expand Up @@ -319,6 +321,32 @@ public function fetchAll(string $sql): array
return $this->query($sql)->fetchAll();
}

/**
* Get the parameters array for prepared insert statement
*
* @param array $row Row to be inserted into DB
* @return array
*/
protected function getInsertParameters(array $row): array
{
$params = [];
foreach ($row as $value) {
if ($value instanceof Literal) {
continue;
} elseif ($value instanceof DateTime) {
$params[] = $value->toDateTimeString();
} elseif ($value instanceof Date) {
$params[] = $value->toDateString();
} elseif (is_bool($value)) {
$params[] = $this->castToBool($value);
} else {
$params[] = $value;
}
}

return $params;
}

/**
* @inheritDoc
*/
Expand All @@ -342,21 +370,14 @@ public function insert(Table $table, array $row): void
$this->output->writeln($sql);
} else {
$sql .= '(';
$vals = [];
$values = [];
foreach ($row as $value) {
$values[] = $value instanceof Literal ? (string)$value : '?';
if (!($value instanceof Literal)) {
if (is_bool($value)) {
$vals[] = $this->castToBool($value);
} else {
$vals[] = $value;
}
}
}
$params = $this->getInsertParameters($row);
$sql .= implode(', ', $values) . ')';
$stmt = $this->getConnection()->prepare($sql);
$stmt->execute($vals);
$stmt->execute($params);
}
}

Expand Down Expand Up @@ -424,21 +445,13 @@ public function bulkinsert(Table $table, array $rows): void
}
$sql .= implode(',', $queries);
$stmt = $this->getConnection()->prepare($sql);
$vals = [];
$params = [];

foreach ($rows as $row) {
foreach ($row as $v) {
if ($v instanceof Literal) {
continue;
} elseif (is_bool($v)) {
$vals[] = $this->castToBool($v);
} else {
$vals[] = $v;
}
}
$params = array_merge($params, $this->getInsertParameters($row));
}

$stmt->execute($vals);
$stmt->execute($params);
}
}

Expand Down
14 changes: 7 additions & 7 deletions tests/Phinx/Console/Command/SeedRunTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function testExecute()
$command = $application->find('seed:run');

// mock the manager class
/** @var Manager|\PHPUnit\Framework\MockObject\MockObject $managerStub */
/** @var \Phinx\Migration\Manager|\PHPUnit\Framework\MockObject\MockObject $managerStub */
$managerStub = $this->getMockBuilder('\Phinx\Migration\Manager')
->setConstructorArgs([$this->config, $this->input, $this->output])
->getMock();
Expand Down Expand Up @@ -102,7 +102,7 @@ public function testExecuteWithDsn()
]);

// mock the manager class
/** @var Manager|\PHPUnit\Framework\MockObject\MockObject $managerStub */
/** @var \Phinx\Migration\Manager|\PHPUnit\Framework\MockObject\MockObject $managerStub */
$managerStub = $this->getMockBuilder('\Phinx\Migration\Manager')
->setConstructorArgs([$config, $this->input, $this->output])
->getMock();
Expand All @@ -127,7 +127,7 @@ public function testExecuteWithEnvironmentOption()
$command = $application->find('seed:run');

// mock the manager class
/** @var Manager|\PHPUnit\Framework\MockObject\MockObject $managerStub */
/** @var \Phinx\Migration\Manager|\PHPUnit\Framework\MockObject\MockObject $managerStub */
$managerStub = $this->getMockBuilder('\Phinx\Migration\Manager')
->setConstructorArgs([$this->config, $this->input, $this->output])
->getMock();
Expand All @@ -153,7 +153,7 @@ public function testExecuteWithInvalidEnvironmentOption()
$command = $application->find('seed:run');

// mock the manager class
/** @var Manager|\PHPUnit\Framework\MockObject\MockObject $managerStub */
/** @var \Phinx\Migration\Manager|\PHPUnit\Framework\MockObject\MockObject $managerStub */
$managerStub = $this->getMockBuilder('\Phinx\Migration\Manager')
->setConstructorArgs([$this->config, $this->input, $this->output])
->getMock();
Expand All @@ -180,7 +180,7 @@ public function testDatabaseNameSpecified()
$command = $application->find('seed:run');

// mock the manager class
/** @var Manager|\PHPUnit\Framework\MockObject\MockObject $managerStub */
/** @var \Phinx\Migration\Manager|\PHPUnit\Framework\MockObject\MockObject $managerStub */
$managerStub = $this->getMockBuilder('\Phinx\Migration\Manager')
->setConstructorArgs([$this->config, $this->input, $this->output])
->getMock();
Expand All @@ -205,7 +205,7 @@ public function testExecuteMultipleSeeders()
$command = $application->find('seed:run');

// mock the manager class
/** @var Manager|\PHPUnit\Framework\MockObject\MockObject $managerStub */
/** @var \Phinx\Migration\Manager|\PHPUnit\Framework\MockObject\MockObject $managerStub */
$managerStub = $this->getMockBuilder('\Phinx\Migration\Manager')
->setConstructorArgs([$this->config, $this->input, $this->output])
->getMock();
Expand Down Expand Up @@ -256,7 +256,7 @@ public function testSeedRunMemorySqlite()
$command = $application->find('seed:run');

// mock the manager class
/** @var Manager|\PHPUnit\Framework\MockObject\MockObject $managerStub */
/** @var \Phinx\Migration\Manager|\PHPUnit\Framework\MockObject\MockObject $managerStub */
$managerStub = $this->getMockBuilder('\Phinx\Migration\Manager')
->setConstructorArgs([$config, $this->input, $this->output])
->getMock();
Expand Down
54 changes: 54 additions & 0 deletions tests/Phinx/Db/Adapter/MysqlAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
namespace Test\Phinx\Db\Adapter;

use Cake\Database\Query;
use Cake\I18n\Date;
use Cake\I18n\DateTime;
use InvalidArgumentException;
use PDO;
use PDOException;
Expand Down Expand Up @@ -2215,6 +2217,30 @@ public function testBulkInsertLiteral()
$this->assertEquals('2025-01-01 00:00:00', $rows[2]['column2']);
}

public function testBulkInsertDates(): void
{
$data = [
[
'name' => 'foo',
'created' => new Date(),
],
[
'name' => 'bar',
'created' => new DateTime(),
],
];
$table = new Table('table1', [], $this->adapter);
$table->addColumn('name', 'string')
->addColumn('created', 'datetime')
->insert($data)
->save();
$rows = $this->adapter->fetchAll('SELECT * FROM table1');
$this->assertEquals('foo', $rows[0]['name']);
$this->assertEquals('bar', $rows[1]['name']);
$this->assertEquals($data[0]['created']->toDateTimeString(), $rows[0]['created']);
$this->assertEquals($data[1]['created']->toDateTimeString(), $rows[1]['created']);
}

public function testInsertData()
{
$data = [
Expand Down Expand Up @@ -2287,6 +2313,34 @@ public function testInsertLiteral()
$this->assertEquals('2025-01-01 00:00:00', $rows[2]['column3']);
}

public function testInsertDates(): void
{
$data = [
[
'name' => 'foo',
'created' => new Date(),
'column3' => 'foo',
],
[
'name' => 'bar',
'created' => new DateTime(),
],
];
$table = new Table('table1', [], $this->adapter);
$table->addColumn('name', 'string')
->addColumn('created', 'datetime')
->addColumn('column3', 'string', ['null' => true, 'default' => null])
->insert($data)
->save();
$rows = $this->adapter->fetchAll('SELECT * FROM table1');
$this->assertEquals('foo', $rows[0]['name']);
$this->assertEquals('bar', $rows[1]['name']);
$this->assertEquals($data[0]['created']->toDateTimeString(), $rows[0]['created']);
$this->assertEquals($data[1]['created']->toDateTimeString(), $rows[1]['created']);
$this->assertEquals('foo', $rows[0]['column3']);
$this->assertNull($rows[1]['column3']);
}

public function testDumpCreateTable()
{
$inputDefinition = new InputDefinition([new InputOption('dry-run')]);
Expand Down
54 changes: 54 additions & 0 deletions tests/Phinx/Db/Adapter/PostgresAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
namespace Test\Phinx\Db\Adapter;

use Cake\Database\Query;
use Cake\I18n\Date;
use Cake\I18n\DateTime;
use InvalidArgumentException;
use PDO;
use Phinx\Db\Adapter\AbstractAdapter;
Expand Down Expand Up @@ -2447,6 +2449,30 @@ public function testBulkInsertLiteral()
$this->assertEquals('2025-01-01 00:00:00', $rows[2]['column2']);
}

public function testBulkInsertDates(): void
{
$data = [
[
'name' => 'foo',
'created' => new Date(),
],
[
'name' => 'bar',
'created' => new DateTime(),
],
];
$table = new Table('table1', [], $this->adapter);
$table->addColumn('name', 'string')
->addColumn('created', 'datetime')
->insert($data)
->save();
$rows = $this->adapter->fetchAll('SELECT * FROM table1');
$this->assertEquals('foo', $rows[0]['name']);
$this->assertEquals('bar', $rows[1]['name']);
$this->assertEquals($data[0]['created']->toDateTimeString(), $rows[0]['created']);
$this->assertEquals($data[1]['created']->toDateTimeString(), $rows[1]['created']);
}

public function testInsertData()
{
$table = new Table('table1', [], $this->adapter);
Expand Down Expand Up @@ -2532,6 +2558,34 @@ public function testInsertLiteral()
$this->assertEquals('2025-01-01 00:00:00', $rows[2]['column3']);
}

public function testInsertDates(): void
{
$data = [
[
'name' => 'foo',
'created' => new Date(),
'column3' => 'foo',
],
[
'name' => 'bar',
'created' => new DateTime(),
],
];
$table = new Table('table1', [], $this->adapter);
$table->addColumn('name', 'string')
->addColumn('created', 'datetime')
->addColumn('column3', 'string', ['null' => true, 'default' => null])
->insert($data)
->save();
$rows = $this->adapter->fetchAll('SELECT * FROM table1');
$this->assertEquals('foo', $rows[0]['name']);
$this->assertEquals('bar', $rows[1]['name']);
$this->assertEquals($data[0]['created']->toDateTimeString(), $rows[0]['created']);
$this->assertEquals($data[1]['created']->toDateTimeString(), $rows[1]['created']);
$this->assertEquals('foo', $rows[0]['column3']);
$this->assertNull($rows[1]['column3']);
}

public function testInsertDataWithSchema()
{
$this->adapter->createSchema('schema1');
Expand Down
54 changes: 54 additions & 0 deletions tests/Phinx/Db/Adapter/SQLiteAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

use BadMethodCallException;
use Cake\Database\Query;
use Cake\I18n\Date;
use Cake\I18n\DateTime;
use Exception;
use InvalidArgumentException;
use PDO;
Expand Down Expand Up @@ -1901,6 +1903,58 @@ public function testBulkInsertDataEnum()
$this->assertEquals('c', $rows[0]['column3']);
}

public function testBulkInsertDates(): void
{
$data = [
[
'name' => 'foo',
'created' => new Date(),
],
[
'name' => 'bar',
'created' => new DateTime(),
],
];
$table = new Table('table1', [], $this->adapter);
$table->addColumn('name', 'string')
->addColumn('created', 'datetime')
->insert($data)
->save();
$rows = $this->adapter->fetchAll('SELECT * FROM table1');
$this->assertEquals('foo', $rows[0]['name']);
$this->assertEquals('bar', $rows[1]['name']);
$this->assertEquals($data[0]['created']->toDateString(), $rows[0]['created']);
$this->assertEquals($data[1]['created']->toDateTimeString(), $rows[1]['created']);
}

public function testInsertDates(): void
{
$data = [
[
'name' => 'foo',
'created' => new Date(),
'column3' => 'foo',
],
[
'name' => 'bar',
'created' => new DateTime(),
],
];
$table = new Table('table1', [], $this->adapter);
$table->addColumn('name', 'string')
->addColumn('created', 'datetime')
->addColumn('column3', 'string', ['null' => true, 'default' => null])
->insert($data)
->save();
$rows = $this->adapter->fetchAll('SELECT * FROM table1');
$this->assertEquals('foo', $rows[0]['name']);
$this->assertEquals('bar', $rows[1]['name']);
$this->assertEquals($data[0]['created']->toDateString(), $rows[0]['created']);
$this->assertEquals($data[1]['created']->toDateTimeString(), $rows[1]['created']);
$this->assertEquals('foo', $rows[0]['column3']);
$this->assertNull($rows[1]['column3']);
}

public function testNullWithoutDefaultValue()
{
$this->markTestSkipped('Skipping for now. See Github Issue #265.');
Expand Down
Loading
Loading