From 8bc9c94b72f0fc89c09b6abe51dd089f1095b20f Mon Sep 17 00:00:00 2001 From: Kacper Donat Date: Tue, 11 Sep 2018 21:15:42 +0200 Subject: [PATCH] fix migrations and data passing from server --- resources/ts/urls.ts | 2 +- src/Service/DataUpdater.php | 6 +++++- templates/app.html.twig | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/resources/ts/urls.ts b/resources/ts/urls.ts index ca61a30..be1e989 100644 --- a/resources/ts/urls.ts +++ b/resources/ts/urls.ts @@ -56,5 +56,5 @@ export default { get: `${base}/stops/{id}`, tracks: `${base}/stops/{id}/tracks` }, - prepare: (url: string, params: UrlParams = { }) => prepare(url, Object.assign({}, { provider: window['app'].provider }, params)) + prepare: (url: string, params: UrlParams = { }) => prepare(url, Object.assign({}, { provider: window['data'].provider }, params)) } \ No newline at end of file diff --git a/src/Service/DataUpdater.php b/src/Service/DataUpdater.php index 0bf9819..d489460 100644 --- a/src/Service/DataUpdater.php +++ b/src/Service/DataUpdater.php @@ -3,8 +3,10 @@ namespace App\Service; use App\Event\DataUpdateEvent; +use Doctrine\DBAL\Schema\Table; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Kadet\Functional\Predicats as p; class DataUpdater { @@ -30,7 +32,9 @@ class DataUpdater public function update() { $schema = $this->em->getConnection()->getSchemaManager(); - collect($schema->listTables())->each([$schema, 'dropAndCreateTable']); + collect($schema->listTables())->reject(function (Table $schema) { + return $schema->getName() === 'migrations'; + })->each([$schema, 'dropAndCreateTable']); $this->dispatcher->dispatch(self::UPDATE_EVENT, new DataUpdateEvent()); } diff --git a/templates/app.html.twig b/templates/app.html.twig index 5f4c41a..7de8470 100644 --- a/templates/app.html.twig +++ b/templates/app.html.twig @@ -19,7 +19,7 @@ {% block javascripts %}