[db] Adjust PK for bb_attachments (hurtom#27)

yukoff · Aug 20, 2017 · ef51aa1 · ef51aa1
1 parent 0a5ff89
commit ef51aa1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/database/entities/Database/Entities/BbAttachments.php b/database/entities/Database/Entities/BbAttachments.php
@@ -15,7 +15,7 @@ class BbAttachments
     /**
      * @var integer
      */
-    private $postId;
+    private $postId = 0;
 
     /**
      * @var integer

diff --git a/database/mappings/Database.Entities.BbAttachments.dcm.yml b/database/mappings/Database.Entities.BbAttachments.dcm.yml
@@ -28,16 +28,18 @@ Database\Entities\BbAttachments:
             nullable: false
             options:
                 unsigned: true
+                default: 0
             id: true
             column: post_id
-    fields:
         privmsgsId:
             type: integer
             nullable: false
             options:
                 unsigned: true
                 default: 0
+            id: true
             column: privmsgs_id
+    fields:
         userId1:
             type: integer
             nullable: false

diff --git a/database/migrations/Version20170601000000.php b/database/migrations/Version20170601000000.php
@@ -361,11 +361,11 @@ public function up(Schema $schema)
         $this->addSql('DROP INDEX attach_id_post_id ON bb_attachments');
         $this->addSql('ALTER TABLE bb_attachments
             CHANGE attach_id attach_id INT UNSIGNED NOT NULL,
-            CHANGE post_id post_id INT UNSIGNED NOT NULL,
+            CHANGE post_id post_id INT UNSIGNED DEFAULT 0 NOT NULL,
             CHANGE privmsgs_id privmsgs_id INT UNSIGNED DEFAULT 0 NOT NULL,
             CHANGE user_id_1 user_id_1 INT DEFAULT 0 NOT NULL,
             CHANGE user_id_2 user_id_2 INT DEFAULT 0 NOT NULL,
-            ADD PRIMARY KEY (attach_id, post_id),
+            ADD PRIMARY KEY (attach_id, post_id, privmsgs_id),
             ENGINE = InnoDB');
 
         // bb_attachments_config