Don't add CREATE SCHEMA public commands to down migrations

app/DoctrineMigrations/Version182.php

@@ -37,8 +37,6 @@ public function down(Schema $schema)
     {
         // this down() migration is auto-generated, please modify it to your needs
         $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('CREATE SCHEMA public');
         $this->addSql('ALTER TABLE checklist_information DROP CONSTRAINT FK_3FB5A813B16D08A7');
         $this->addSql('DROP TABLE checklist');
         $this->addSql('DROP TABLE checklist_information');

app/DoctrineMigrations/Version183.php

@@ -31,8 +31,6 @@ public function down(Schema $schema)
     {
         // this down() migration is auto-generated, please modify it to your needs
         $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('CREATE SCHEMA public');
         $this->addSql('ALTER TABLE checklist DROP CONSTRAINT FK_5C696D2F65CF370E');
         $this->addSql('DROP INDEX IDX_5C696D2F65CF370E');
         $this->addSql('ALTER TABLE checklist DROP last_modified_by');

app/DoctrineMigrations/Version186.php

@@ -28,8 +28,6 @@ public function down(Schema $schema)
     {
         // this down() migration is auto-generated, please modify it to your needs
         $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('CREATE SCHEMA public');
         $this->addSql('ALTER TABLE checklist DROP satisfied_with_pa_expenses');
     }
 }

app/DoctrineMigrations/Version193.php

@@ -23,7 +23,6 @@ public function down(Schema $schema)
     {
         // this down() migration is auto-generated, please modify it to your needs
         $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-        $this->addSql('CREATE SCHEMA public');
         $this->addSql('ALTER TABLE checklist DROP satisfied_with_health_and_lifestyle');
     }
 }

app/DoctrineMigrations/Version196.php

@@ -27,8 +27,6 @@ public function down(Schema $schema)
     {
         // this down() migration is auto-generated, please modify it to your needs
         $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('CREATE SCHEMA public');
         $this->addSql('ALTER TABLE checklist RENAME COLUMN future_significant_decisions TO future_significant_financial_decisions');
     }
 }

app/DoctrineMigrations/Version198.php

@@ -35,8 +35,6 @@ public function down(Schema $schema)
     {
         // this down() migration is auto-generated, please modify it to your needs
         $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('CREATE SCHEMA public');
         $this->addSql('DROP TABLE prof_deputy_other_cost');
         $this->addSql('CREATE INDEX created_on_idx ON report_submission (created_on)');
 

app/DoctrineMigrations/Version201.php

@@ -30,8 +30,6 @@ public function down(Schema $schema)
     {
         // this down() migration is auto-generated, please modify it to your needs
         $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('CREATE SCHEMA public');
         $this->addSql('DROP TABLE prof_deputy_interim_cost');
     }
 }

app/DoctrineMigrations/Version204.php

@@ -34,8 +34,6 @@ public function down(Schema $schema)
     {
         // this down() migration is auto-generated, please modify it to your needs
         $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('CREATE SCHEMA public');
         $this->addSql('ALTER TABLE checklist DROP deputy_charge_allowed_by_court');
         $this->addSql('ALTER TABLE casrec ADD registration_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
         $this->addSql('ALTER TABLE casrec ADD last_logged_in TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');

app/DoctrineMigrations/Version205.php

@@ -30,7 +30,6 @@ public function down(Schema $schema)
     {
         // this down() migration is auto-generated, please modify it to your needs
         $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-        $this->addSql('CREATE SCHEMA public');
         $this->addSql('ALTER TABLE report DROP prof_dc_estimate_hc');
         $this->addSql('DROP TABLE prof_deputy_estimate_cost');
     }

app/DoctrineMigrations/Version206.php

@@ -29,8 +29,6 @@ public function down(Schema $schema)
     {
         // this down() migration is auto-generated, please modify it to your needs
         $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('CREATE SCHEMA public');
         $this->addSql('ALTER TABLE report DROP prof_dc_estimate_more_info');
         $this->addSql('ALTER TABLE report DROP prof_dc_estimate_more_info_details');
     }

app/DoctrineMigrations/Version207.php

@@ -30,8 +30,6 @@ public function down(Schema $schema)
     {
         // this down() migration is auto-generated, please modify it to your needs
         $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('CREATE SCHEMA public');
         $this->addSql('ALTER TABLE checklist DROP payments_match_cost_certificate');
         $this->addSql('ALTER TABLE checklist DROP prof_costs_reasonable_and_proportionate');
         $this->addSql('ALTER TABLE checklist DROP has_deputy_overcharged_from_previous_estimates');

app/DoctrineMigrations/Version208.php

@@ -28,8 +28,6 @@ public function down(Schema $schema)
     {
         // this down() migration is auto-generated, please modify it to your needs
         $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('CREATE SCHEMA public');
         $this->addSql('ALTER TABLE report ADD prof_dc_hc_agreed BOOLEAN DEFAULT NULL');
     }
 }

app/DoctrineMigrations/Version210.php

@@ -28,8 +28,6 @@ public function down(Schema $schema)
     {
         // this down() migration is auto-generated, please modify it to your needs
         $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('CREATE SCHEMA public');
         $this->addSql('ALTER TABLE checklist DROP next_billing_estimate_satisfactory');
     }
 }

app/DoctrineMigrations/Version211.php

@@ -33,7 +33,6 @@ public function down(Schema $schema)
         // this down() migration is auto-generated, please modify it to your needs
         $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
 
-        $this->addSql('CREATE SCHEMA public');
         $this->addSql('ALTER TABLE report ADD prof_dc_hc_fixed BOOLEAN DEFAULT NULL');
         $this->addSql('ALTER TABLE report ADD prof_dc_hc_assessed BOOLEAN DEFAULT NULL');
         $this->addSql('ALTER TABLE report DROP prof_dc_how_charged');

app/DoctrineMigrations/Version212.php

@@ -28,8 +28,6 @@ public function down(Schema $schema)
     {
         // this down() migration is auto-generated, please modify it to your needs
         $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('CREATE SCHEMA public');
         $this->addSql('ALTER TABLE document ADD deleted_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
     }
 }

app/config/services.yml

@@ -24,6 +24,11 @@ services:
             - { name: doctrine.event_listener, event: prePersist, method: prePersist }
             - { name: doctrine.event_listener, event: preRemove, method: preRemove }
 
+    fixDefaultSchemaListener:
+        class: AppBundle\EventListener\FixDefaultSchemaListener
+        tags:
+            - { name: doctrine.event_listener, event: postGenerateSchema, method: postGenerateSchema }
+
     opg_digideps.casrec_verification_service:
         class: AppBundle\Service\CasrecVerificationService
         arguments: [ "@em" ]

src/AppBundle/EventListener/FixDefaultSchemaListener.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace AppBundle\EventListener;
+
+use Doctrine\Common\EventSubscriber;
+use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
+
+class FixDefaultSchemaListener implements EventSubscriber
+{
+    public function getSubscribedEvents()
+    {
+        return array(
+            'postGenerateSchema',
+        );
+    }
+
+    public function postGenerateSchema(GenerateSchemaEventArgs $Args)
+    {
+        $Schema = $Args->getSchema();
+
+        if (! $Schema->hasNamespace('public')) {
+            $Schema->createNamespace('public');
+        }
+    }
+}