Merge pull request #6 from arisgi/CalculateStrategy

Installerの修正
nanasess · Feb 13, 2017 · 2599e8d · 2599e8d
2 parents dfecad0 + 14914ec
commit 2599e8d
Show file tree

Hide file tree

Showing 3 changed files with 846 additions and 846 deletions.
diff --git a/eccube_install.php b/eccube_install.php
@@ -325,7 +325,7 @@ function initializeDatabase(\Eccube\Application $app)
     $encodedPassword = $passwordEncoder->encodePassword($login_password, $salt);
 
     out('Creating admin accounts...', 'info');
-    $sql = "INSERT INTO dtb_member (member_id, login_id, password, salt, work, del_flg, authority, creator_id, rank, update_date, create_date,name,department) VALUES (2, :login_id, :admin_pass , :salt , '1', '0', '0', '1', '1', current_timestamp, current_timestamp,'管理者', 'EC-CUBE SHOP');";
+    $sql = "INSERT INTO dtb_member (member_id, login_id, password, salt, work, del_flg, authority, creator_id, rank, update_date, create_date, name, department, discriminator_type) VALUES (2, :login_id, :admin_pass , :salt , '1', '0', '0', '1', '1', current_timestamp, current_timestamp,'管理者', 'EC-CUBE SHOP', 'member');";
     $stmt = $pdo->prepare($sql);
     $stmt->execute(
         array(
@@ -338,7 +338,7 @@ function initializeDatabase(\Eccube\Application $app)
 
     $shop_name = getenv('SHOP_NAME');
     $admin_mail = getenv('ADMIN_MAIL');
-    $sql = "INSERT INTO dtb_base_info (id, shop_name, email01, email02, email03, email04, update_date, option_product_tax_rule) VALUES (1, :shop_name, :admin_mail1, :admin_mail2, :admin_mail3, :admin_mail4, current_timestamp, 0)";
+    $sql = "INSERT INTO dtb_base_info (id, shop_name, email01, email02, email03, email04, update_date, option_product_tax_rule, discriminator_type) VALUES (1, :shop_name, :admin_mail1, :admin_mail2, :admin_mail3, :admin_mail4, current_timestamp, 0, 'baseinfo')";
     $stmt = $pdo->prepare($sql);
     $stmt->execute(
         array(