Merge cd39c15 into e8482f0

EC-CUBE · Sep 15, 2017 · ac5b3aa · ac5b3aa
2 parents e8482f0 + cd39c15
commit ac5b3aa
Show file tree

Hide file tree

Showing 21 changed files with 296 additions and 316 deletions.
diff --git a/eccube_install.php b/eccube_install.php
@@ -340,7 +340,6 @@ function initializeDatabase(\Eccube\Application $app)
         'password' => $encodedPassword,
         'salt' => $salt,
         'work' => 1,
-        'del_flg' => 0,
         'authority' => 0,
         'creator_id' => 1,
         'rank' => 1,

diff --git a/src/Eccube/Doctrine/EventSubscriber/InitSubscriber.php b/src/Eccube/Doctrine/EventSubscriber/InitSubscriber.php
@@ -64,6 +64,8 @@ public function postConnect(ConnectionEventArgs $args)
             $db->executeQuery("SET SESSION time_zone = '+00:00'");
         } elseif ($platform === 'postgresql') {
             $db->executeQuery("SET TIME ZONE 'UTC'");
+        } elseif ($platform === 'sqlite') {
+            $db->executeQuery("PRAGMA foreign_keys = ON");
         }
     }
 }
diff --git a/src/Eccube/Entity/Member.php b/src/Eccube/Entity/Member.php
@@ -130,13 +130,6 @@ public function eraseCredentials()
      */
     private $rank;
 
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="del_flg", type="smallint", options={"unsigned":true,"default":0})
-     */
-    private $del_flg = 0;
-
     /**
      * @var \DateTime
      *
@@ -343,30 +336,6 @@ public function getRank()
         return $this->rank;
     }
 
-    /**
-     * Set delFlg.
-     *
-     * @param int $delFlg
-     *
-     * @return Member
-     */
-    public function setDelFlg($delFlg)
-    {
-        $this->del_flg = $delFlg;
-
-        return $this;
-    }
-
-    /**
-     * Get delFlg.
-     *
-     * @return int
-     */
-    public function getDelFlg()
-    {
-        return $this->del_flg;
-    }
-
     /**
      * Set createDate.
      *

diff --git a/src/Eccube/Repository/MemberRepository.php b/src/Eccube/Repository/MemberRepository.php
@@ -219,8 +219,7 @@ public function save($Member)
                     $rank = 0;
                 }
                 $Member
-                    ->setRank($rank + 1)
-                    ->setDelFlg(Constant::DISABLED);
+                    ->setRank($rank + 1);
             }
 
             $em->persist($Member);
@@ -253,11 +252,7 @@ public function delete($Member)
                 ->getQuery()
                 ->execute();
 
-            $Member
-                ->setDelFlg(Constant::ENABLED)
-                ->setRank(0);
-
-            $em->persist($Member);
+            $em->remove($Member);
             $em->flush();
 
             $em->getConnection()->commit();

diff --git a/src/Eccube/Resource/doctrine/import_csv/dtb_category.csv b/src/Eccube/Resource/doctrine/import_csv/dtb_category.csv
@@ -1,7 +1,7 @@
 category_id,parent_category_id,creator_id,category_name,hierarchy,rank,create_date,update_date,discriminator_type
-"1",,"1","キッチンツール","1","5","2017-03-07 10:14:52","2017-03-07 10:14:52","category"
-"2",,"1","インテリア","1","6","2017-03-07 10:14:52","2017-03-07 10:14:52","category"
-"3","1","1","食器","2","3","2017-03-07 10:14:52","2017-03-07 10:14:52","category"
-"4","1","1","調理器具","2","4","2017-03-07 10:14:52","2017-03-07 10:14:52","category"
-"5","3","1","フォーク","3","2","2017-03-07 10:14:52","2017-03-07 10:14:52","category"
-"6",,"1","新入荷","1","1","2017-03-07 10:14:52","2017-03-07 10:14:52","category"
+"1",,,"キッチンツール","1","5","2017-03-07 10:14:52","2017-03-07 10:14:52","category"
+"2",,,"インテリア","1","6","2017-03-07 10:14:52","2017-03-07 10:14:52","category"
+"3","1",,"食器","2","3","2017-03-07 10:14:52","2017-03-07 10:14:52","category"
+"4","1",,"調理器具","2","4","2017-03-07 10:14:52","2017-03-07 10:14:52","category"
+"5","3",,"フォーク","3","2","2017-03-07 10:14:52","2017-03-07 10:14:52","category"
+"6",,,"新入荷","1","1","2017-03-07 10:14:52","2017-03-07 10:14:52","category"
diff --git a/src/Eccube/Resource/doctrine/import_csv/dtb_class_category.csv b/src/Eccube/Resource/doctrine/import_csv/dtb_class_category.csv
@@ -1,7 +1,7 @@
 class_category_id,class_name_id,creator_id,name,rank,create_date,update_date,visible,discriminator_type
-"1","1","1","金","1","2017-03-07 10:14:52","2017-03-07 10:14:52","1","classcategory"
-"2","1","1","銀","2","2017-03-07 10:14:52","2017-03-07 10:14:52","1","classcategory"
-"3","1","1","プラチナ","3","2017-03-07 10:14:52","2017-03-07 10:14:52","1","classcategory"
-"4","2","1","120mm","1","2017-03-07 10:14:52","2017-03-07 10:14:52","1","classcategory"
-"5","2","1","170mm","2","2017-03-07 10:14:52","2017-03-07 10:14:52","1","classcategory"
-"6","2","1","150cm","3","2017-03-07 10:14:52","2017-03-07 10:14:52","1","classcategory"
+"1","1",,"金","1","2017-03-07 10:14:52","2017-03-07 10:14:52","1","classcategory"
+"2","1",,"銀","2","2017-03-07 10:14:52","2017-03-07 10:14:52","1","classcategory"
+"3","1",,"プラチナ","3","2017-03-07 10:14:52","2017-03-07 10:14:52","1","classcategory"
+"4","2",,"120mm","1","2017-03-07 10:14:52","2017-03-07 10:14:52","1","classcategory"
+"5","2",,"170mm","2","2017-03-07 10:14:52","2017-03-07 10:14:52","1","classcategory"
+"6","2",,"150cm","3","2017-03-07 10:14:52","2017-03-07 10:14:52","1","classcategory"
diff --git a/src/Eccube/Resource/doctrine/import_csv/dtb_class_name.csv b/src/Eccube/Resource/doctrine/import_csv/dtb_class_name.csv
@@ -1,3 +1,3 @@
 class_name_id,creator_id,name,rank,create_date,update_date,discriminator_type
-"1","1","材質","1","2017-03-07 10:14:52","2017-03-07 10:14:52","classname"
-"2","1","サイズ","2","2017-03-07 10:14:52","2017-03-07 10:14:52","classname"
+"1",,"材質","1","2017-03-07 10:14:52","2017-03-07 10:14:52","classname"
+"2",,"サイズ","2","2017-03-07 10:14:52","2017-03-07 10:14:52","classname"