Skip to content

Commit

Permalink
Merge pull request #7342 in SW/shopware from sw-23338/5.5/add-auto-in…
Browse files Browse the repository at this point in the history
…crement-to-migration to 5.5

* commit '961a8e5cc4dca62be97b1da1469780d719a91042':
  SW-23338 - Remove ID from SQL in migration to use auto-increment
  • Loading branch information
shyim committed Jan 21, 2019
2 parents 308733c + 961a8e5 commit f754d04
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion UPGRADE-5.5.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ This changelog references changes done in Shopware 5.5 patch versions.

### Changes

* Changed the selector for the emotion-wrapper in `jquery.emotion.js` to fix an issue with emotions using the 'resize' layout
* Changed the selector for the emotion-wrapper in `jquery.emotion.js` to fix an issue with emotions using the 'resize' layout
* Changed SQL in migration to fix possible issues

## 5.5.5

Expand Down
4 changes: 2 additions & 2 deletions _sql/migrations/1452-change-laststock-filter.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ public function up($modus)
WHERE description = "Abverkauf-Artikel ohne Lagerbestand";
SQL;
$sql4 = <<<'SQL'
INSERT INTO s_multi_edit_filter
VALUES (6,'<b>Abverkauf-Variantenartikel</b><br><small>nicht auf Lager</small>',' DETAIL.LASTSTOCK ISTRUE and DETAIL.INSTOCK <= 0','Abverkauf-Variantenartikel ohne Lagerbestand',NULL,1,0);
INSERT INTO s_multi_edit_filter (`name`, `filter_string`, `description`, `created`, `is_favorite`, `is_simple`)
VALUES ('<b>Abverkauf-Variantenartikel</b><br><small>nicht auf Lager</small>',' DETAIL.LASTSTOCK ISTRUE and DETAIL.INSTOCK <= 0','Abverkauf-Variantenartikel ohne Lagerbestand',NULL,1,0);
SQL;

$this->addSql($sql);
Expand Down

0 comments on commit f754d04

Please sign in to comment.