Skip to content

Commit dd7a744

Browse files
authored
bug #170 Various fixes including doctrine mapping exception (loevgaard)
This PR was merged into the 1.0-dev branch. Discussion ---------- Fixes #169 Commits ------- 6219b1e Be explicit about column names de7f8da Be consistent about column names in credit memo c23b38e Be consistent about column names in refund f62c4e2 Fixed error: Root image path not resolvable "/path/to/project/public/media/image" 258be3c Added migration
2 parents db2fb3b + 258be3c commit dd7a744

File tree

4 files changed

+36
-5
lines changed

4 files changed

+36
-5
lines changed
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace DoctrineMigrations;
6+
7+
use Doctrine\DBAL\Schema\Schema;
8+
use Doctrine\Migrations\AbstractMigration;
9+
10+
final class Version20191217075815 extends AbstractMigration
11+
{
12+
public function up(Schema $schema) : void
13+
{
14+
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
15+
16+
$this->addSql('DROP INDEX IDX_5C4F3331989A8203 ON sylius_refund_credit_memo');
17+
$this->addSql('ALTER TABLE sylius_refund_credit_memo CHANGE orderNumber order_number VARCHAR(255) NOT NULL, CHANGE currencyCode currency_code VARCHAR(255) NOT NULL, CHANGE localeCode locale_code VARCHAR(255) NOT NULL');
18+
$this->addSql('CREATE INDEX IDX_5C4F3331551F0F81 ON sylius_refund_credit_memo (order_number)');
19+
$this->addSql('ALTER TABLE sylius_refund_refund CHANGE ordernumber order_number VARCHAR(255) NOT NULL');
20+
}
21+
22+
public function down(Schema $schema) : void
23+
{
24+
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
25+
26+
$this->addSql('DROP INDEX IDX_5C4F3331551F0F81 ON sylius_refund_credit_memo');
27+
$this->addSql('ALTER TABLE sylius_refund_credit_memo CHANGE order_number orderNumber VARCHAR(255) CHARACTER SET utf8 NOT NULL COLLATE `utf8_unicode_ci`, CHANGE currency_code currencyCode VARCHAR(255) CHARACTER SET utf8 NOT NULL COLLATE `utf8_unicode_ci`, CHANGE locale_code localeCode VARCHAR(255) CHARACTER SET utf8 NOT NULL COLLATE `utf8_unicode_ci`');
28+
$this->addSql('CREATE INDEX IDX_5C4F3331989A8203 ON sylius_refund_credit_memo (orderNumber)');
29+
$this->addSql('ALTER TABLE sylius_refund_refund CHANGE order_number orderNumber VARCHAR(255) CHARACTER SET utf8 NOT NULL COLLATE `utf8_unicode_ci`');
30+
}
31+
}

src/Resources/config/doctrine/CreditMemo.orm.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<id name="id" column="id" type="string" />
1111

1212
<field name="number" />
13-
<field name="orderNumber" />
13+
<field name="orderNumber" column="order_number" />
1414
<field name="total" type="integer" />
1515
<field name="units" type="json" />
16-
<field name="currencyCode" />
17-
<field name="localeCode" />
16+
<field name="currencyCode" column="currency_code" />
17+
<field name="localeCode" column="locale_code" />
1818
<field name="comment" type="text" />
1919
<field name="issuedAt" column="issued_at" type="datetime" nullable="true" />
2020

@@ -37,7 +37,7 @@
3737
</one-to-one>
3838

3939
<indexes>
40-
<index columns="orderNumber" />
40+
<index columns="order_number" />
4141
</indexes>
4242
</mapped-superclass>
4343
</doctrine-mapping>

src/Resources/config/doctrine/Refund.orm.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<generator strategy="AUTO" />
1212
</id>
1313

14-
<field name="orderNumber"/>
14+
<field name="orderNumber" column="order_number" />
1515
<field name="amount" type="integer" />
1616
<field name="refundedUnitId" type="integer" nullable="true" column="refunded_unit_id"/>
1717
<field name="type" type="sylius_refund_refund_type" />

tests/Application/public/media/image/.gitignore

Whitespace-only changes.

0 commit comments

Comments
 (0)