[Svn-src-all:885] [version-2_5-dev 19773] #829(mtb_pref を他の mtb_* と同等のテーブル定義に)
Seasoft
admin ＠ mail.ec-cube.net
2010年 12月 28日 (火) 06:21:57 JST
Subversion committed to /home/svn/open 19773
http://svn.ec-cube.net/open_trac/changeset/19773
┌────────────────────────────┐
│更新者 : Seasoft │
│更新日時: 2010-12-28 06:21:56 +0900 (火, 28 12月 2010)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#829(mtb_pref を他の mtb_* と同等のテーブル定義に)
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/class/SC_Fpdf.php
U branches/version-2_5-dev/data/class/SC_View.php
U branches/version-2_5-dev/data/class/helper/SC_Helper_CSV.php
U branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php
U branches/version-2_5-dev/data/class/pages/abouts/LC_Page_Abouts.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
U branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php
U branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php
U branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php
U branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
U branches/version-2_5-dev/data/class/pages/contact/LC_Page_Contact.php
U branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php
U branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Order.php
U branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php
U branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php
U branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php
U branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php
U branches/version-2_5-dev/data/class/pages/order/LC_Page_Order.php
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_DelivAddr.php
U branches/version-2_5-dev/data/class/util/SC_Utils.php
U branches/version-2_5-dev/html/install/sql/column_comment.sql
U branches/version-2_5-dev/html/install/sql/create_table_mysql.sql
U branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql
U branches/version-2_5-dev/html/install/sql/insert_data.sql
U branches/version-2_5-dev/test/class/db/SC_DB_MasterData_Test.php
変更: branches/version-2_5-dev/data/class/SC_Fpdf.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Fpdf.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/SC_Fpdf.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -39,7 +39,7 @@
$this->tpl_title = $title;
$this->tpl_dispmode = "real"; // 表示モード
$masterData = new SC_DB_MasterData_Ex();
- $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
$this->width_cell = array(110.3,12,21.7,24.5);
$this->label_cell[] = $this->sjis_conv("商品名 / 商品コード / [ 規格 ]");
変更: branches/version-2_5-dev/data/class/SC_View.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_View.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/SC_View.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -74,7 +74,7 @@
// 都道府県名を変換
$masterData = new SC_DB_MasterData_Ex();
- $arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+ $arrPref = $masterData->getMasterData('mtb_pref');
$arrInfo['arrSiteInfo']['pref'] =
isset($arrPref[$arrInfo['arrSiteInfo']['pref']])
? $arrPref[$arrInfo['arrSiteInfo']['pref']] : "";
変更: branches/version-2_5-dev/data/class/helper/SC_Helper_CSV.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_CSV.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_CSV.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -45,8 +45,7 @@
$this->init();
$masterData = new SC_DB_MasterData_Ex();
- $this->arrPref = $masterData->getMasterData("mtb_pref",
- array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
$this->arrSex = $masterData->getMasterData("mtb_sex");
$this->arrDISP = $masterData->getMasterData("mtb_disp");
$this->arrRECOMMEND = $masterData->getMasterData("mtb_recommend");
変更: branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -39,8 +39,7 @@
function SC_Helper_Mail() {
$masterData = new SC_DB_MasterData_Ex();
$this->arrMAILTPLPATH = $masterData->getMasterData("mtb_mail_tpl_path");
- $this->arrPref = $masterData->getMasterData("mtb_pref",
- array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
}
/* DBに登録されたテンプレートメールの送信 */
変更: branches/version-2_5-dev/data/class/pages/abouts/LC_Page_Abouts.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/abouts/LC_Page_Abouts.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/abouts/LC_Page_Abouts.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -47,7 +47,7 @@
$this->tpl_page_category = 'abouts';
$this->tpl_title = '当サイトについて';
$masterData = new SC_DB_MasterData_Ex();
- $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
}
/**
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -48,7 +48,7 @@
$this->tpl_subno = 'index';
$this->tpl_mainno = 'basis';
$masterData = new SC_DB_MasterData_Ex();
- $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
$this->arrTAXRULE = $masterData->getMasterData("mtb_taxrule");
$this->tpl_subtitle = 'SHOPマスタ';
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -48,7 +48,7 @@
$this->tpl_subno = 'delivery';
$this->tpl_mainno = 'basis';
$masterData = new SC_DB_MasterData_Ex();
- $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
$this->arrTAXRULE = $masterData->getMasterData("mtb_taxrule");
$this->tpl_subtitle = '配送業者設定';
}
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -53,7 +53,7 @@
$this->tpl_subno = 'delivery';
$this->tpl_mainno = 'basis';
$masterData = new SC_DB_MasterData_Ex();
- $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
$this->arrProductType = $masterData->getMasterData("mtb_product_type");
$this->tpl_subtitle = '配送業者設定';
$this->mode = isset($_POST['mode']) ? $_POST['mode'] : '';
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -54,7 +54,7 @@
$this->tpl_mainno = 'basis';
$this->tpl_subtitle = 'SEO管理';
$masterData = new SC_DB_MasterData_Ex();
- $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
$this->arrTAXRULE = $masterData->getMasterData("mtb_taxrule");
}
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -53,7 +53,7 @@
$this->tpl_subno = 'tradelaw';
$this->tpl_mainno = 'basis';
$masterData = new SC_DB_MasterData_Ex();
- $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
$this->arrTAXRULE = $masterData->getMasterData("mtb_taxrule");
$this->tpl_subtitle = '特定商取引法';
}
変更: branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -51,8 +51,7 @@
$this->tpl_subtitle = '顧客マスタ';
$masterData = new SC_DB_MasterData_Ex();
- $this->arrPref = $masterData->getMasterData("mtb_pref",
- array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
$this->arrJob = $masterData->getMasterData("mtb_job");
$this->arrJob["不明"] = "不明";
変更: branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -51,7 +51,7 @@
$this->tpl_subtitle = '顧客マスタ';
$masterData = new SC_DB_MasterData_Ex();
- $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
$this->arrJob = $masterData->getMasterData("mtb_job");
$this->arrSex = $masterData->getMasterData("mtb_sex");
$this->arrReminder = $masterData->getMasterData("mtb_reminder");
変更: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -51,7 +51,7 @@
$this->tpl_subtitle = '配信内容設定';
$masterData = new SC_DB_MasterData_Ex();
- $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
$this->arrJob = $masterData->getMasterData("mtb_job");
$this->arrJob["不明"] = "不明";
$this->arrSex = $masterData->getMasterData("mtb_sex");
変更: branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -81,8 +81,7 @@
}
$masterData = new SC_DB_MasterData_Ex();
- $this->arrPref = $masterData->getMasterData("mtb_pref",
- array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
$this->arrORDERSTATUS = $masterData->getMasterData("mtb_order_status");
/* ペイジェント決済モジュール連携用 */
変更: branches/version-2_5-dev/data/class/pages/contact/LC_Page_Contact.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/contact/LC_Page_Contact.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/contact/LC_Page_Contact.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -72,7 +72,7 @@
$this->httpCacheControl('nocache');
$masterData = new SC_DB_MasterData_Ex();
- $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
}
/**
変更: branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -60,8 +60,7 @@
$this->tpl_title .= '会員登録(入力ページ)';
$this->year = "";
$masterData = new SC_DB_MasterData_Ex();
- $this->arrPref = $masterData->getMasterData("mtb_pref",
- array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
$this->arrJob = $masterData->getMasterData("mtb_job");
$this->arrReminder = $masterData->getMasterData("mtb_reminder");
変更: branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Order.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Order.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Order.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -63,8 +63,7 @@
$this->tpl_title = '特定商取引法に基づく表記';
$masterData = new SC_DB_MasterData_Ex();
- $this->arrPref = $masterData->getMasterData("mtb_pref",
- array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
}
/**
変更: branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -58,8 +58,7 @@
$masterData = new SC_DB_MasterData_Ex();
$this->arrReminder = $masterData->getMasterData("mtb_reminder");
- $this->arrPref = $masterData->getMasterData("mtb_pref",
- array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
$this->arrJob = $masterData->getMasterData("mtb_job");
$this->arrMAILMAGATYPE = $masterData->getMasterData("mtb_mail_magazine_type");
$this->arrSex = $masterData->getMasterData("mtb_sex");
@@ -225,8 +224,7 @@
$masterData = new SC_DB_MasterData_Ex();
$this->arrReminder = $masterData->getMasterData("mtb_reminder");
- $this->arrPref = $masterData->getMasterData("mtb_pref",
- array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
$this->arrJob = $masterData->getMasterData("mtb_job");
$this->arrMAILMAGATYPE = $masterData->getMasterData("mtb_mail_magazine_type");
$this->arrSex = $masterData->getMasterData("mtb_sex");
変更: branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -50,8 +50,7 @@
$this->tpl_mainno = 'mypage';
$this->tpl_mypageno = 'delivery';
$masterData = new SC_DB_MasterData_Ex();
- $this->arrPref= $masterData->getMasterData("mtb_pref",
- array("pref_id", "pref_name", "rank"));
+ $this->arrPref= $masterData->getMasterData('mtb_pref');
$this->tpl_column_num = 1;
$this->httpCacheControl('nocache');
}
変更: branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -46,8 +46,7 @@
$this->tpl_mainpage = TEMPLATE_DIR . 'mypage/delivery_addr.tpl';
$this->tpl_title = "お届け先の追加・変更";
$masterData = new SC_DB_MasterData_Ex();
- $this->arrPref= $masterData->getMasterData("mtb_pref",
- array("pref_id", "pref_name", "rank"));
+ $this->arrPref= $masterData->getMasterData('mtb_pref');
$this->httpCacheControl('nocache');
}
変更: branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -53,7 +53,7 @@
$this->httpCacheControl('nocache');
$masterData = new SC_DB_MasterData_Ex();
$this->arrMAILTEMPLATE = $masterData->getMasterData("mtb_mail_template");
- $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
}
/**
変更: branches/version-2_5-dev/data/class/pages/order/LC_Page_Order.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/order/LC_Page_Order.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/order/LC_Page_Order.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -48,8 +48,7 @@
$this->tpl_title = '特定商取引に関する法律に基づく表記';
$masterData = new SC_DB_MasterData_Ex();
- $this->arrPref = $masterData->getMasterData("mtb_pref",
- array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
}
/**
変更: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -55,7 +55,7 @@
$this->tpl_column_num = 1;
$this->tpl_title = 'ログイン';
$masterData = new SC_DB_MasterData();
- $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
$this->arrSex = $masterData->getMasterData("mtb_sex");
$this->arrJob = $masterData->getMasterData("mtb_job");
$this->tpl_onload = 'fnCheckInputDeliv();';
変更: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -48,7 +48,7 @@
$this->tpl_css = URL_DIR.'css/layout/shopping/confirm.css';
$this->tpl_title = "ご入力内容のご確認";
$masterData = new SC_DB_MasterData();
- $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
$this->arrSex = $masterData->getMasterData("mtb_sex");
$this->arrMAILMAGATYPE = $masterData->getMasterData("mtb_mail_magazine_type");
$this->arrReminder = $masterData->getMasterData("mtb_reminder");
変更: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -55,7 +55,7 @@
$this->tpl_column_num = 1;
$this->tpl_css = URL_DIR.'css/layout/shopping/index.css';
$masterData = new SC_DB_MasterData();
- $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
$this->tpl_title = "お届け先の指定";
$this->httpCacheControl('nocache');
}
変更: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_DelivAddr.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_DelivAddr.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_DelivAddr.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -72,7 +72,7 @@
$this->tpl_mainpage = 'shopping/deliv_addr.tpl';
$this->tpl_title = "新しいお届け先の追加";
$masterData = new SC_DB_MasterData_Ex();
- $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+ $this->arrPref = $masterData->getMasterData('mtb_pref');
}
/**
変更: branches/version-2_5-dev/data/class/util/SC_Utils.php
===================================================================
--- branches/version-2_5-dev/data/class/util/SC_Utils.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/data/class/util/SC_Utils.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -2133,7 +2133,7 @@
$objQuery = new SC_Query(ZIP_DSN);
$masterData = new SC_DB_MasterData_Ex();
- $arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+ $arrPref = $masterData->getMasterData('mtb_pref');
// インデックスと値を反転させる。
$arrREV_PREF = array_flip($arrPref);
変更: branches/version-2_5-dev/html/install/sql/column_comment.sql
===================================================================
(バイナリファイルが異なっています)
変更: branches/version-2_5-dev/html/install/sql/create_table_mysql.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/create_table_mysql.sql 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/html/install/sql/create_table_mysql.sql 2010-12-27 21:21:56 UTC (rev 19773)
@@ -749,13 +749,6 @@
point_rate numeric
) TYPE=InnoDB;
-CREATE TABLE mtb_pref (
- pref_id smallint NOT NULL,
- pref_name text,
- rank smallint NOT NULL DEFAULT 0,
- PRIMARY KEY (pref_id)
-) TYPE=InnoDB;
-
CREATE TABLE dtb_member (
member_id int NOT NULL,
name text,
@@ -882,6 +875,12 @@
create_date datetime NOT NULL
) TYPE=InnoDB;
+CREATE TABLE mtb_pref (
+ id smallint NOT NULL,
+ name text,
+ rank smallint NOT NULL DEFAULT 0,
+ PRIMARY KEY (pref_id)
+) TYPE=InnoDB;
CREATE TABLE mtb_permission (
id text,
変更: branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql 2010-12-27 21:21:56 UTC (rev 19773)
@@ -751,13 +751,6 @@
point_rate numeric
);
-CREATE TABLE mtb_pref (
- pref_id smallint NOT NULL,
- pref_name text,
- rank smallint NOT NULL DEFAULT 0,
- PRIMARY KEY (pref_id)
-);
-
CREATE TABLE dtb_member (
member_id int NOT NULL,
name text,
@@ -884,6 +877,13 @@
create_date timestamp NOT NULL DEFAULT Now()
);
+CREATE TABLE mtb_pref (
+ id text,
+ name text,
+ rank smallint NOT NULL DEFAULT 0,
+ PRIMARY KEY (id)
+);
+
CREATE TABLE mtb_permission (
id text,
name text,
変更: branches/version-2_5-dev/html/install/sql/insert_data.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/insert_data.sql 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/html/install/sql/insert_data.sql 2010-12-27 21:21:56 UTC (rev 19773)
@@ -288,7 +288,7 @@
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (116, 3, 'order_fax03', 'FAX3', 14, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (117, 3, 'order_zip01', '郵便番号1', 15, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (118, 3, 'order_zip02', '郵便番号2', 16, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (119, 3, '(SELECT pref_name FROM mtb_pref WHERE pref_id = dtb_order.order_pref)', '都道府県', 17, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (119, 3, '(SELECT name FROM mtb_pref WHERE id = dtb_order.order_pref)', '都道府県', 17, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (120, 3, 'order_addr01', '住所1', 18, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (121, 3, 'order_addr02', '住所2', 19, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (122, 3, 'order_sex', '性別', 20, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
@@ -306,7 +306,7 @@
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (134, 3, 'deliv_fax03', 'FAX3', 32, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (135, 3, 'deliv_zip01', '郵便番号1', 33, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (136, 3, 'deliv_zip02', '郵便番号2', 34, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (137, 3, '(SELECT pref_name FROM mtb_pref WHERE pref_id = dtb_order.deliv_pref)', '都道府県', 35, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (137, 3, '(SELECT name FROM mtb_pref WHERE id = dtb_order.deliv_pref)', '都道府県', 35, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (138, 3, 'deliv_addr01', '住所1', 36, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (139, 3, 'deliv_addr02', '住所2', 37, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (140, 3, 'subtotal', '小計', 38, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
@@ -342,7 +342,7 @@
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (170, 4, 'order_fax03', 'FAX3', 15, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (171, 4, 'order_zip01', '郵便番号1', 16, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (172, 4, 'order_zip02', '郵便番号2', 17, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (173, 4, '(SELECT pref_name FROM mtb_pref WHERE pref_id = dtb_order.order_pref)', '都道府県', 18, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (173, 4, '(SELECT name FROM mtb_pref WHERE id = dtb_order.order_pref)', '都道府県', 18, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (174, 4, 'order_addr01', '住所1', 19, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (175, 4, 'order_addr02', '住所2', 20, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (176, 4, 'order_sex', '性別', 21, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
@@ -360,7 +360,7 @@
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (188, 4, 'deliv_fax03', 'FAX3', 33, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (189, 4, 'deliv_zip01', '郵便番号1', 34, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (190, 4, 'deliv_zip02', '郵便番号2', 35, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (191, 4, '(SELECT pref_name FROM mtb_pref WHERE pref_id = dtb_order.deliv_pref)', '都道府県', 36, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (191, 4, '(SELECT name FROM mtb_pref WHERE id = dtb_order.deliv_pref)', '都道府県', 36, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (192, 4, 'deliv_addr01', '住所1', 37, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (193, 4, 'deliv_addr02', '住所2', 38, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (194, 4, 'payment_total', 'お支払い合計', 39, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
@@ -908,53 +908,53 @@
INSERT INTO mtb_permission (id, name, rank) VALUES ('/admin/entry/inputzip.php', '1', 10);
INSERT INTO mtb_permission (id, name, rank) VALUES ('/admin/search/delete_note.php', '1', 11);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (1, '北海道', 1);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (2, '青森県', 2);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (3, '岩手県', 3);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (4, '宮城県', 4);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (5, '秋田県', 5);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (6, '山形県', 6);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (7, '福島県', 7);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (8, '茨城県', 8);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (9, '栃木県', 9);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (10, '群馬県', 10);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (11, '埼玉県', 11);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (12, '千葉県', 12);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (13, '東京都', 13);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (14, '神奈川県', 14);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (15, '新潟県', 15);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (16, '富山県', 16);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (17, '石川県', 17);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (18, '福井県', 18);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (19, '山梨県', 19);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (20, '長野県', 20);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (21, '岐阜県', 21);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (22, '静岡県', 22);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (23, '愛知県', 23);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (24, '三重県', 24);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (25, '滋賀県', 25);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (26, '京都府', 26);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (27, '大阪府', 27);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (28, '兵庫県', 28);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (29, '奈良県', 29);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (30, '和歌山県', 30);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (31, '鳥取県', 31);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (32, '島根県', 32);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (33, '岡山県', 33);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (34, '広島県', 34);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (35, '山口県', 35);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (36, '徳島県', 36);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (37, '香川県', 37);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (38, '愛媛県', 38);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (39, '高知県', 39);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (40, '福岡県', 40);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (41, '佐賀県', 41);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (42, '長崎県', 42);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (43, '熊本県', 43);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (44, '大分県', 44);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (45, '宮崎県', 45);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (46, '鹿児島県', 46);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (47, '沖縄県', 47);
+INSERT INTO mtb_pref (id, name, rank) VALUES (1, '北海道', 1);
+INSERT INTO mtb_pref (id, name, rank) VALUES (2, '青森県', 2);
+INSERT INTO mtb_pref (id, name, rank) VALUES (3, '岩手県', 3);
+INSERT INTO mtb_pref (id, name, rank) VALUES (4, '宮城県', 4);
+INSERT INTO mtb_pref (id, name, rank) VALUES (5, '秋田県', 5);
+INSERT INTO mtb_pref (id, name, rank) VALUES (6, '山形県', 6);
+INSERT INTO mtb_pref (id, name, rank) VALUES (7, '福島県', 7);
+INSERT INTO mtb_pref (id, name, rank) VALUES (8, '茨城県', 8);
+INSERT INTO mtb_pref (id, name, rank) VALUES (9, '栃木県', 9);
+INSERT INTO mtb_pref (id, name, rank) VALUES (10, '群馬県', 10);
+INSERT INTO mtb_pref (id, name, rank) VALUES (11, '埼玉県', 11);
+INSERT INTO mtb_pref (id, name, rank) VALUES (12, '千葉県', 12);
+INSERT INTO mtb_pref (id, name, rank) VALUES (13, '東京都', 13);
+INSERT INTO mtb_pref (id, name, rank) VALUES (14, '神奈川県', 14);
+INSERT INTO mtb_pref (id, name, rank) VALUES (15, '新潟県', 15);
+INSERT INTO mtb_pref (id, name, rank) VALUES (16, '富山県', 16);
+INSERT INTO mtb_pref (id, name, rank) VALUES (17, '石川県', 17);
+INSERT INTO mtb_pref (id, name, rank) VALUES (18, '福井県', 18);
+INSERT INTO mtb_pref (id, name, rank) VALUES (19, '山梨県', 19);
+INSERT INTO mtb_pref (id, name, rank) VALUES (20, '長野県', 20);
+INSERT INTO mtb_pref (id, name, rank) VALUES (21, '岐阜県', 21);
+INSERT INTO mtb_pref (id, name, rank) VALUES (22, '静岡県', 22);
+INSERT INTO mtb_pref (id, name, rank) VALUES (23, '愛知県', 23);
+INSERT INTO mtb_pref (id, name, rank) VALUES (24, '三重県', 24);
+INSERT INTO mtb_pref (id, name, rank) VALUES (25, '滋賀県', 25);
+INSERT INTO mtb_pref (id, name, rank) VALUES (26, '京都府', 26);
+INSERT INTO mtb_pref (id, name, rank) VALUES (27, '大阪府', 27);
+INSERT INTO mtb_pref (id, name, rank) VALUES (28, '兵庫県', 28);
+INSERT INTO mtb_pref (id, name, rank) VALUES (29, '奈良県', 29);
+INSERT INTO mtb_pref (id, name, rank) VALUES (30, '和歌山県', 30);
+INSERT INTO mtb_pref (id, name, rank) VALUES (31, '鳥取県', 31);
+INSERT INTO mtb_pref (id, name, rank) VALUES (32, '島根県', 32);
+INSERT INTO mtb_pref (id, name, rank) VALUES (33, '岡山県', 33);
+INSERT INTO mtb_pref (id, name, rank) VALUES (34, '広島県', 34);
+INSERT INTO mtb_pref (id, name, rank) VALUES (35, '山口県', 35);
+INSERT INTO mtb_pref (id, name, rank) VALUES (36, '徳島県', 36);
+INSERT INTO mtb_pref (id, name, rank) VALUES (37, '香川県', 37);
+INSERT INTO mtb_pref (id, name, rank) VALUES (38, '愛媛県', 38);
+INSERT INTO mtb_pref (id, name, rank) VALUES (39, '高知県', 39);
+INSERT INTO mtb_pref (id, name, rank) VALUES (40, '福岡県', 40);
+INSERT INTO mtb_pref (id, name, rank) VALUES (41, '佐賀県', 41);
+INSERT INTO mtb_pref (id, name, rank) VALUES (42, '長崎県', 42);
+INSERT INTO mtb_pref (id, name, rank) VALUES (43, '熊本県', 43);
+INSERT INTO mtb_pref (id, name, rank) VALUES (44, '大分県', 44);
+INSERT INTO mtb_pref (id, name, rank) VALUES (45, '宮崎県', 45);
+INSERT INTO mtb_pref (id, name, rank) VALUES (46, '鹿児島県', 46);
+INSERT INTO mtb_pref (id, name, rank) VALUES (47, '沖縄県', 47);
INSERT INTO mtb_product_list_max (id, name, rank) VALUES (15, '15件', 0);
INSERT INTO mtb_product_list_max (id, name, rank) VALUES (30, '30件', 1);
変更: branches/version-2_5-dev/test/class/db/SC_DB_MasterData_Test.php
===================================================================
--- branches/version-2_5-dev/test/class/db/SC_DB_MasterData_Test.php 2010-12-27 14:26:17 UTC (rev 19772)
+++ branches/version-2_5-dev/test/class/db/SC_DB_MasterData_Test.php 2010-12-27 21:21:56 UTC (rev 19773)
@@ -41,7 +41,7 @@
* SC_DB_MasterData::getMasterData() のテストケース
*/
function testGetMasterData() {
- $columns = array("pref_id", "pref_name", "rank");
+ $columns = array("id", "name", "rank");
$masterData = new SC_DB_MasterData_Ex();
$actual = $masterData->getMasterData("mtb_pref", $columns);
@@ -62,7 +62,7 @@
*/
function testUpdateMasterData() {
- $columns = array("pref_id", "pref_name", "rank");
+ $columns = array("id", "name", "rank");
$masterData = new SC_DB_MasterData_Ex();
// Transaction を有効にするため接続しておく
Svn-src-all メーリングリストの案内