Merge pull request EC-CUBE#17 from chihiro-adachi/refactor

スキーマ定義の見直し
geany-y · May 6, 2016 · f1fc745 · f1fc745
2 parents baae9f0 + a9e4a77
commit f1fc745
Show file tree

Hide file tree

Showing 13 changed files with 66 additions and 526 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -55,3 +55,7 @@ after_script:
   - php app/console plugin:develop disable --code=${PLUGIN_CODE}
   # uninstall plugin
   - php app/console plugin:develop uninstall --code=${PLUGIN_CODE}
+  # re install plugin
+  - php app/console plugin:develop install --code=${PLUGIN_CODE}
+  # re enable plugin
+  - php app/console plugin:develop enable --code=${PLUGIN_CODE}
diff --git a/Entity/PointInfoAddStatus.php b/Entity/PointInfoAddStatus.php
diff --git a/Repository/PointInfoAddStatusRepository.php b/Repository/PointInfoAddStatusRepository.php
diff --git a/Resource/doctrine/Plugin.Point.Entity.Point.dcm.yml b/Resource/doctrine/Plugin.Point.Entity.Point.dcm.yml
@@ -13,34 +13,24 @@ Plugin\Point\Entity\Point:
     fields:
         plg_dynamic_point:
             type: integer
-            nullable: true
+            nullable: false
             unsigned: false
-            options:
-                default: 0
         order_id:
             type: integer
             nullable: true
             unsigned: false
-            options:
-                default: 0
         customer_id:
             type: integer
-            nullable: true
+            nullable: false
             unsigned: false
-            options:
-                default: 0
         plg_point_type:
             type: smallint
             nullable: false
             unsigned: false
-            options:
-                default: 0
         plg_point_action_name:
             type: string
             length: 255
             nullable: true
-            options:
-                default: null
         plg_point_product_rate_id:
             type: integer
             nullable: true
@@ -49,10 +39,8 @@ Plugin\Point\Entity\Point:
                 default: null
         plg_point_info_id:
             type: integer
-            nullable: true
+            nullable: false
             unsigned: false
-            options:
-                default: null
         create_date:
             type: datetime
             nullable: false

diff --git a/Resource/doctrine/Plugin.Point.Entity.PointCustomer.dcm.yml b/Resource/doctrine/Plugin.Point.Entity.PointCustomer.dcm.yml
@@ -13,16 +13,12 @@ Plugin\Point\Entity\PointCustomer:
     fields:
         plg_point_current:
             type: integer
-            nullable: true
+            nullable: false
             unsigned: false
-            options:
-                default: 0
         customer_id:
             type: integer
-            nullable: true
+            nullable: false
             unsigned: false
-            options:
-                default: 0
         create_date:
             type: datetime
             nullable: false

diff --git a/Resource/doctrine/Plugin.Point.Entity.PointInfo.dcm.yml b/Resource/doctrine/Plugin.Point.Entity.PointInfo.dcm.yml
@@ -14,30 +14,20 @@ Plugin\Point\Entity\PointInfo:
         plg_add_point_status:
             type: smallint
             nullable: false
-            options:
-                default: 0
         plg_basic_point_rate:
             type: integer
             unsigned: false
-            nullable: true
-            options:
-                default: 0
+            nullable: false
         plg_point_conversion_rate:
             type: integer
             unsigned: false
-            nullable: true
-            options:
-                default: 0
+            nullable: false
         plg_round_type:
             type: smallint
             nullable: false
-            options:
-                default: 0
         plg_calculation_type:
             type: smallint
             nullable: false
-            options:
-                default: 0
         create_date:
             type: datetime
             nullable: false

diff --git a/Resource/doctrine/Plugin.Point.Entity.PointInfoAddStatus.dcm.yml b/Resource/doctrine/Plugin.Point.Entity.PointInfoAddStatus.dcm.yml
diff --git a/Resource/doctrine/Plugin.Point.Entity.PointProductRate.dcm.yml b/Resource/doctrine/Plugin.Point.Entity.PointProductRate.dcm.yml
@@ -15,8 +15,6 @@ Plugin\Point\Entity\PointProductRate:
             type: integer
             nullable: false
             unsigned: false
-            options:
-                default: 0
         plg_point_product_rate:
             type: integer
             nullable: true