Ignore:
Timestamp:
2012/05/07 01:27:10 (12 years ago)
Author:
nanasess
bzr:base-revision:
nanasess@fsm.ne.jp-20120506152147-ax0qre64rxi2o56m
bzr:committer:
Kentaro Ohkouchi <nanasess@fsm.ne.jp>
bzr:file-ids:

data/Smarty/templates/admin/basis/payment.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fbasis%2Fpayment.tpl
data/Smarty/templates/admin/basis/payment_input.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fbasis%2Fpayment_input.tpl
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/admin/basis/LC_Page_Admin_Basis.php 15291@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php 15298@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Payment.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php 20543@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_PaymentInput.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php 15307@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Point.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php 15335@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_ZipInstall.php
data/class/pages/shopping/LC_Page_Shopping_Payment.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Payment.php
html/install/index.php 16809@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Findex.php
html/install/sql/create_table_mysql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_mysql.sql
html/install/sql/create_table_pgsql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_pgsql.sql
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql
bzr:mapping-version:
v4
bzr:merge:

nanasess@fsm.ne.jp-20120506162631-s0q2vyyi2v6an6xu
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
nanasess@fsm.ne.jp-20120506162703-jf1842vihihlkmfc
bzr:revno:
4478
bzr:revprop:branch-nick:
branches/version-2_12-dev
bzr:root:
branches/version-2_12-dev
bzr:testament:

bazaar-ng testament short form 2.1
revision-id: nanasess@fsm.ne.jp-20120506162703-jf1842vihihlkmfc
sha1: e2d8362ad9c1bb23909d8cd1f8c0b43ca798206b
bzr:timestamp:
2012-05-07 01:27:03.698999882 +0900
bzr:user-agent:
bzr2.4.2+bzr-svn1.1.2
Message:

#1573 プライマリーキーが無いテーブルの改善

  • dtb_baseinfo, mtb_zip にはプライマリーキーとなるカラムを追加

#800 SQL標準に準拠する

  • rule -> rule_max
Location:
branches/version-2_12-dev/html/install
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_12-dev/html/install/index.php

    r21756 r21810  
    519519    $arrDsn = getArrayDsn($objDBParam); 
    520520 
     521    $sqlval['id'] = 1; 
    521522    $sqlval['shop_name'] = $objWebParam->getValue('shop_name'); 
    522523    $sqlval['email01'] = $objWebParam->getValue('admin_mail'); 

  • branches/version-2_12-dev/html/install/sql/create_table_mysql.sql

    r21795 r21810  
    1212 
    1313CREATE TABLE dtb_ownersstore_settings ( 
    14     public_key text 
     14    public_key text, 
     15    PRIMARY KEY(public_key(64)) 
    1516); 
    1617 
    … …  
    4142 
    4243CREATE TABLE mtb_zip ( 
     44    zip_id int, 
    4345    zipcode text, 
    4446    state text, 
    4547    city text, 
    46     town text 
     48    town text, 
     49    PRIMARY KEY (zip_id) 
    4750); 
    4851 
    … …  
    6669 
    6770CREATE TABLE dtb_baseinfo ( 
     71    id int, 
    6872    company_name text, 
    6973    company_kana text, 
    … …  
    129133    longitude text, 
    130134    downloadable_days numeric DEFAULT 30, 
    131     downloadable_days_unlimited smallint 
     135    downloadable_days_unlimited smallint, 
     136    PRIMARY KEY (id) 
    132137); 
    133138 
    … …  
    174179    payment_method text, 
    175180    charge numeric, 
    176     rule numeric, 
     181    rule_max numeric, 
    177182    rank int, 
    178183    note text, 
    … …  
    387392    creator_id int NOT NULL, 
    388393    create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, 
    389     update_date timestamp NOT NULL 
     394    update_date timestamp NOT NULL, 
     395    PRIMARY KEY (recommend_product_id) 
    390396); 
    391397 
    … …  
    628634    memo09 text, 
    629635    memo10 text, 
    630     session text 
     636    session text, 
     637    PRIMARY KEY (order_temp_id(64)) 
    631638); 
    632639 
    … …  
    10851092    param_value text, 
    10861093    url text, 
    1087     create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP 
     1094    create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, 
     1095    PRIMARY KEY (session_id(255)) 
    10881096); 
    10891097 
    … …  
    10961104    del_flg smallint NOT NULL DEFAULT 0, 
    10971105    create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, 
    1098     update_date timestamp NOT NULL 
     1106    update_date timestamp NOT NULL, 
     1107    PRIMARY KEY (module_id) 
    10991108); 
    11001109 

  • branches/version-2_12-dev/html/install/sql/create_table_pgsql.sql

    r21795 r21810  
    1212 
    1313CREATE TABLE dtb_ownersstore_settings ( 
    14     public_key text 
     14    public_key text, 
     15    PRIMARY KEY(public_key) 
    1516); 
    1617 
    … …  
    4142 
    4243CREATE TABLE mtb_zip ( 
     44    zip_id int, 
    4345    zipcode text, 
    4446    state text, 
    4547    city text, 
    46     town text 
     48    town text, 
     49    PRIMARY KEY (zip_id) 
    4750); 
    4851 
    … …  
    6669 
    6770CREATE TABLE dtb_baseinfo ( 
     71    id int, 
    6872    company_name text, 
    6973    company_kana text, 
    … …  
    129133    longitude text, 
    130134    downloadable_days numeric DEFAULT 30, 
    131     downloadable_days_unlimited smallint 
     135    downloadable_days_unlimited smallint, 
     136    PRIMARY KEY (id) 
    132137); 
    133138 
    … …  
    174179    payment_method text, 
    175180    charge numeric, 
    176     rule numeric, 
     181    rule_max numeric, 
    177182    rank int, 
    178183    note text, 
    … …  
    387392    creator_id int NOT NULL, 
    388393    create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, 
    389     update_date timestamp NOT NULL 
     394    update_date timestamp NOT NULL, 
     395    PRIMARY KEY (recommend_product_id) 
    390396); 
    391397 
    … …  
    628634    memo09 text, 
    629635    memo10 text, 
    630     session text 
     636    session text, 
     637    PRIMARY KEY (order_temp_id) 
    631638); 
    632639 
    … …  
    10851092    param_value text, 
    10861093    url text, 
    1087     create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP 
     1094    create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, 
     1095    PRIMARY KEY (session_id) 
    10881096); 
    10891097 
    … …  
    10961104    del_flg smallint NOT NULL DEFAULT 0, 
    10971105    create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, 
    1098     update_date timestamp NOT NULL 
     1106    update_date timestamp NOT NULL, 
     1107    PRIMARY KEY (module_id) 
    10991108); 
    11001109 

  • branches/version-2_12-dev/html/install/sql/insert_data.sql

    r21798 r21810  
    682682INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 37, 'ご利用ガイド/運営会社紹介', 'guide/about.php', 'guide/about', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    683683 
    684 INSERT INTO dtb_payment (payment_id, payment_method, charge, rule, rank, note, fix, status, del_flg, creator_id, create_date, update_date, payment_image, upper_rule, charge_flg, rule_min, upper_rule_max, module_id, module_path, memo01, memo02, memo03, memo04, memo05, memo06, memo07, memo08, memo09, memo10) VALUES (1, '郵便振替', 0, NULL, 4, NULL, 2, 1, 0, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); 
    685 INSERT INTO dtb_payment (payment_id, payment_method, charge, rule, rank, note, fix, status, del_flg, creator_id, create_date, update_date, payment_image, upper_rule, charge_flg, rule_min, upper_rule_max, module_id, module_path, memo01, memo02, memo03, memo04, memo05, memo06, memo07, memo08, memo09, memo10) VALUES (2, '現金書留', 0, NULL, 3, NULL, 2, 1, 0, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); 
    686 INSERT INTO dtb_payment (payment_id, payment_method, charge, rule, rank, note, fix, status, del_flg, creator_id, create_date, update_date, payment_image, upper_rule, charge_flg, rule_min, upper_rule_max, module_id, module_path, memo01, memo02, memo03, memo04, memo05, memo06, memo07, memo08, memo09, memo10) VALUES (3, '銀行振込', 0, NULL, 2, NULL, 2, 1, 0, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); 
    687 INSERT INTO dtb_payment (payment_id, payment_method, charge, rule, rank, note, fix, status, del_flg, creator_id, create_date, update_date, payment_image, upper_rule, charge_flg, rule_min, upper_rule_max, module_id, module_path, memo01, memo02, memo03, memo04, memo05, memo06, memo07, memo08, memo09, memo10) VALUES (4, '代金引換', 0, NULL, 1, NULL, 2, 1, 0, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); 
     684INSERT INTO dtb_payment (payment_id, payment_method, charge, rule_max, rank, note, fix, status, del_flg, creator_id, create_date, update_date, payment_image, upper_rule, charge_flg, rule_min, upper_rule_max, module_id, module_path, memo01, memo02, memo03, memo04, memo05, memo06, memo07, memo08, memo09, memo10) VALUES (1, '郵便振替', 0, NULL, 4, NULL, 2, 1, 0, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); 
     685INSERT INTO dtb_payment (payment_id, payment_method, charge, rule_max, rank, note, fix, status, del_flg, creator_id, create_date, update_date, payment_image, upper_rule, charge_flg, rule_min, upper_rule_max, module_id, module_path, memo01, memo02, memo03, memo04, memo05, memo06, memo07, memo08, memo09, memo10) VALUES (2, '現金書留', 0, NULL, 3, NULL, 2, 1, 0, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); 
     686INSERT INTO dtb_payment (payment_id, payment_method, charge, rule_max, rank, note, fix, status, del_flg, creator_id, create_date, update_date, payment_image, upper_rule, charge_flg, rule_min, upper_rule_max, module_id, module_path, memo01, memo02, memo03, memo04, memo05, memo06, memo07, memo08, memo09, memo10) VALUES (3, '銀行振込', 0, NULL, 2, NULL, 2, 1, 0, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); 
     687INSERT INTO dtb_payment (payment_id, payment_method, charge, rule_max, rank, note, fix, status, del_flg, creator_id, create_date, update_date, payment_image, upper_rule, charge_flg, rule_min, upper_rule_max, module_id, module_path, memo01, memo02, memo03, memo04, memo05, memo06, memo07, memo08, memo09, memo10) VALUES (4, '代金引換', 0, NULL, 1, NULL, 2, 1, 0, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); 
    688688 
    689689INSERT INTO dtb_product_categories (product_id, category_id, rank) VALUES (1, 5, 1); 
Note: See TracChangeset for help on using the changeset viewer.