Ignore:
Timestamp:
2010/08/19 19:48:04 (14 years ago)
Author:
nanasess
bzr:base-revision:
ohkouchi@loop-az.jp-20100818061207-vgzu2onofgbq0k0i
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/class/SC_Query.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Query.php
data/class/helper/SC_Helper_Mail.php 15618@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_Mail.php
data/class/helper/SC_Helper_Mobile.php 15277@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_Mobile.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_Control.php 15336@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Control.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php 15297@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Delivery_Input.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php 17073@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Holiday.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php 15329@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Kiyaku.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php 15304@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Payment_Input.php
data/class/pages/admin/contents/LC_Page_Admin_Contents.php 15659@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcontents%2FLC_Page_Admin_Contents.php
data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php 16449@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcontents%2FLC_Page_Admin_Contents_CsvSql.php
data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php 15660@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcontents%2FLC_Page_Admin_Contents_Recommend.php
data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php 15687@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_Bloc.php
data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php 15682@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_MainEdit.php
data/class/pages/admin/mail/LC_Page_Admin_Mail.php 15640@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fmail%2FLC_Page_Admin_Mail.php
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 15594@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_Edit.php
data/class/pages/admin/products/LC_Page_Admin_Products_Category.php 15518@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_Category.php
data/class/pages/admin/products/LC_Page_Admin_Products_Class.php 15481@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_Class.php
data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php 15486@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_ClassCategory.php
data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php 17263@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_Maker.php
data/class/pages/admin/products/LC_Page_Admin_Products_Product.php 15342@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_Product.php
data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php 15559@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_ProductClass.php
data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php 15472@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_UploadCSV.php
data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php 17194@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_UploadCSVCategory.php
data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php 16251@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fsystem%2FLC_Page_Admin_System_Bkup.php
data/class/pages/admin/system/LC_Page_Admin_System_Input.php 15602@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fsystem%2FLC_Page_Admin_System_Input.php
data/class/pages/entry/LC_Page_Entry.php 15141@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fentry%2FLC_Page_Entry.php
data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php 16093@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_DeliveryAddr.php
data/class/pages/products/LC_Page_Products_Review.php 15173@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_Review.php
data/class/pages/shopping/LC_Page_Shopping_Complete.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Complete.php
data/class/pages/shopping/LC_Page_Shopping_Confirm.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Confirm.php
data/class/pages/shopping/LC_Page_Shopping_DelivAddr.php 16386@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_DelivAddr.php
data/class/pages/tb/LC_Page_TrackBack.php 16472@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ftb%2FLC_Page_TrackBack.php
data/class/pages/upgrade/LC_Page_Upgrade_Download.php 16459@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fupgrade%2FLC_Page_Upgrade_Download.php
html/install/index.php 16809@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Findex.php
html/install/sql/column_comment.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcolumn_comment.sql
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
html/install/sql/table_comment.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Ftable_comment.sql
bzr:mapping-version:
v4
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20100819104758-beubop5hq0pwdqhx
bzr:revno:
2271
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-parents:

data/class/SC_Query.php ohkouchi@loop-az.jp-20100812103342-5fc7rp06997dbg6e
data/class/helper/SC_Helper_Mail.php ohkouchi@loop-az.jp-20100623032937-dhwktuevjyk0jv13
data/class/helper/SC_Helper_Mobile.php ohkouchi@loop-az.jp-20100803050621-j3gswdse0qsqamvw
data/class/pages/admin/basis/LC_Page_Admin_Basis_Control.php ohkouchi@loop-az.jp-20100803084717-9sbbuk4o59x5sio4
data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php ohkouchi@loop-az.jp-20100803084717-9sbbuk4o59x5sio4
data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php ohkouchi@loop-az.jp-20100803084717-9sbbuk4o59x5sio4
data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php ohkouchi@loop-az.jp-20100803084717-9sbbuk4o59x5sio4
data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php ohkouchi@loop-az.jp-20100803084717-9sbbuk4o59x5sio4
data/class/pages/admin/contents/LC_Page_Admin_Contents.php ohkouchi@loop-az.jp-20100803050621-j3gswdse0qsqamvw
data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php ohkouchi@loop-az.jp-20100803050621-j3gswdse0qsqamvw
data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php ohkouchi@loop-az.jp-20100803084717-9sbbuk4o59x5sio4
data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php ohkouchi@loop-az.jp-20100803050621-j3gswdse0qsqamvw
data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php ohkouchi@loop-az.jp-20100803050621-j3gswdse0qsqamvw
data/class/pages/admin/mail/LC_Page_Admin_Mail.php ohkouchi@loop-az.jp-20100803084717-9sbbuk4o59x5sio4
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php ohkouchi@loop-az.jp-20100803084717-9sbbuk4o59x5sio4
data/class/pages/admin/products/LC_Page_Admin_Products_Category.php ohkouchi@loop-az.jp-20100803084717-9sbbuk4o59x5sio4
data/class/pages/admin/products/LC_Page_Admin_Products_Class.php ohkouchi@loop-az.jp-20100803084717-9sbbuk4o59x5sio4
data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php ohkouchi@loop-az.jp-20100803084717-9sbbuk4o59x5sio4
data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php ohkouchi@loop-az.jp-20100803084717-9sbbuk4o59x5sio4
data/class/pages/admin/products/LC_Page_Admin_Products_Product.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:18782
data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m
data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:18777
data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php ohkouchi@loop-az.jp-20100803084717-9sbbuk4o59x5sio4
data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m
data/class/pages/admin/system/LC_Page_Admin_System_Input.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m
data/class/pages/entry/LC_Page_Entry.php ohkouchi@loop-az.jp-20100803050621-j3gswdse0qsqamvw
data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php ohkouchi@loop-az.jp-20100803084717-9sbbuk4o59x5sio4
data/class/pages/products/LC_Page_Products_Review.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m
data/class/pages/shopping/LC_Page_Shopping_Complete.php ohkouchi@loop-az.jp-20100804045224-nsulc26bh1ttqfrb
data/class/pages/shopping/LC_Page_Shopping_Confirm.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:18777
data/class/pages/shopping/LC_Page_Shopping_DelivAddr.php ohkouchi@loop-az.jp-20100803084717-9sbbuk4o59x5sio4
data/class/pages/tb/LC_Page_TrackBack.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m
data/class/pages/upgrade/LC_Page_Upgrade_Download.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m
html/install/index.php ohkouchi@loop-az.jp-20100818061055-lqje64n4qlsd2ke9
html/install/sql/column_comment.sql ohkouchi@loop-az.jp-20100818061055-lqje64n4qlsd2ke9
html/install/sql/create_table_mysql.sql ohkouchi@loop-az.jp-20100818061055-lqje64n4qlsd2ke9
html/install/sql/create_table_pgsql.sql ohkouchi@loop-az.jp-20100818061055-lqje64n4qlsd2ke9
html/install/sql/insert_data.sql ohkouchi@loop-az.jp-20100818061055-lqje64n4qlsd2ke9
html/install/sql/table_comment.sql ohkouchi@loop-az.jp-20100818033838-mjtat0sdmbsu0981
bzr:timestamp:
2010-08-19 19:47:58.180000067 +0900
bzr:user-agent:
bzr2.1.2+bzr-svn1.0.2
svn:original-date:
2010-08-19T10:47:58.180000Z
Message:

シーケンス値の出力に SC_Query::nextVal() を使用するよう修正(#780)

  • インストーラでシーケンスの生成/削除を行うよう修正
  • html/install/sql/insert_data.sql を, シーケンス値を含めたものに修正
  • PostgreSQL の serial 型を int 型に修正
  • MySQL で auto_increment を使用しないように修正
  • シーケンスIDを使用するテーブルへの INSERT を行っている個所で, 事前にシーケンス値を取得するよう修正
  • FIXME data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php を要改修
File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_5-dev/data/class/SC_Query.php

    r18784 r18788  
    626626    } 
    627627 
    628     // TODO MDB2::nextID のエイリアスとする 
    629     function nextval($table, $colname) { 
    630         $sql = ""; 
    631         // postgresqlとmysqlとで処理を分ける 
    632         if (DB_TYPE == "pgsql") { 
    633             $seqtable = $table . "_" . $colname . "_seq"; 
    634             $sql = "SELECT NEXTVAL('$seqtable')"; 
    635         }else if (DB_TYPE == "mysql") { 
    636             $sql = "SELECT last_insert_id();"; 
    637         } 
    638         $ret = $this->getOne($sql); 
    639  
    640         return $ret; 
    641     } 
    642  
    643     // TODO MDB2::currID のエイリアスとする 
    644     function currval($table, $colname) { 
    645         $sql = ""; 
    646         if (DB_TYPE == "pgsql") { 
    647             $seqtable = $table . "_" . $colname . "_seq"; 
    648             $sql = "SELECT CURRVAL('$seqtable')"; 
    649         }else if (DB_TYPE == "mysql") { 
    650             $sql = "SELECT last_insert_id();"; 
    651         } 
    652         $ret = $this->getOne($sql); 
    653  
    654         return $ret; 
    655     } 
    656  
    657     // TODO MDB2 に該当関数が無いため実装を要検討 
    658     function setval($table, $colname, $data) { 
    659         $sql = ""; 
    660         if (DB_TYPE == "pgsql") { 
    661             $seqtable = $table . "_" . $colname . "_seq"; 
    662             $sql = "SELECT SETVAL('$seqtable', $data)"; 
    663             $ret = $this->getOne($sql); 
    664         }else if (DB_TYPE == "mysql") { 
    665             $sql = "ALTER TABLE $table AUTO_INCREMENT=$data"; 
    666             $ret = $this->query($sql); 
    667         } 
    668  
    669         return $ret; 
     628    /** 
     629     * 次のシーケンス値を取得する. 
     630     * 
     631     * @param string $seq_name 取得するシーケンス名 
     632     * @param integer 次のシーケンス値 
     633     */ 
     634    function nextVal($seq_name) { 
     635        return $this->conn->nextID($seq_name); 
     636    } 
     637 
     638    /** 
     639     * 現在のシーケンス値を取得する. 
     640     * 
     641     * @param string $seq_name 取得するシーケンス名 
     642     * @return integer 現在のシーケンス値 
     643     */ 
     644    function currVal($seq_name) { 
     645        return $this->conn->currID($seq_name); 
     646    } 
     647 
     648    /** 
     649     * シーケンス値を設定する. 
     650     * 
     651     * @param string $seq_name シーケンス名 
     652     * @param integer $start 設定するシーケンス値 
     653     * @return MDB2_OK 
     654     */ 
     655    function setVal($seq_name, $start) { 
     656        $this->conn->loadModule('Manager'); 
     657        // XXX エラーハンドリングを行う 
     658        $this->conn->dropSequence($seq_name); 
     659        return $this->conn->createSequence($seq_name, $start); 
    670660    } 
    671661 
Note: See TracChangeset for help on using the changeset viewer.