Changeset 21830

Timestamp:

2012/05/14 01:11:58 (12 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_12-dev:21829

bzr:committer:

Kentaro Ohkouchi <nanasess@fsm.ne.jp>

bzr:file-ids:

data/class/SC_Initial.php 16506@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Initial.php
data/class/SC_Query.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Query.php
data/class/db/SC_DB_DBFactory.php 15123@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fdb%2FSC_DB_DBFactory.php
data/mtb_constants_init.php 16505@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fmtb_constants_init.php
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-20120513161112-b22q1xk3vcftnz7v

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

nanasess@fsm.ne.jp-20120513161153-af9za3ij3c8h42sp

bzr:revno:

4498

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-20120513161153-af9za3ij3c8h42sp
sha1: cb24e2a55efbdbea0d5c263aa36886930c1eeadf

bzr:timestamp:

2012-05-14 01:11:53.223000050 +0900

bzr:user-agent:

bzr2.4.2+bzr-svn1.1.2

Message:

#1654 (MDB2 への接続設定を連想配列に)

• 下位互換のため DEFAULT_DSN は残しておく

#1607 (未使用定義の削除)

• ZIP_DSN を削除

Location:

branches/version-2_12-dev

Files:

• data/class/SC_Initial.php (modified) (2 diffs)
• data/class/SC_Query.php (modified) (1 diff)
• data/class/db/SC_DB_DBFactory.php (modified) (1 diff)
• data/mtb_constants_init.php (modified) (1 diff)
• html/install/sql/insert_data.sql (modified) (1 diff)

branches/version-2_12-dev/data/class/SC_Initial.php

@@ -83 +83 @@
      * @access protected
      * @return void
+     * @deprecated 下位互換用
      */
     function defineDSN() {
@@ -90 +91 @@
             $dsn = DB_TYPE . '://' . DB_USER . ':' . DB_PASSWORD . '@' . DB_SERVER . ':' . DB_PORT . '/' . DB_NAME;
             /** サイト用DB */
+            // ここで生成した DSN は使用せず, SC_Query のコンストラクタでパラメータを設定する.
             define('DEFAULT_DSN', $dsn);
         }

branches/version-2_12-dev/data/class/SC_Query.php

@@ -49 +49 @@
     function __construct($dsn = '', $force_run = false, $new = false) {
 
-        if ($dsn == '') {
-            $dsn = DEFAULT_DSN;
+        if ($dsn == "") {
+            $dsn = array('phptype'  => DB_TYPE,
+                         'username' => DB_USER,
+                         'password' => DB_PASSWORD,
+                         'protocol' => 'tcp',
+                         'hostspec' => DB_SERVER,
+                         'port'     => DB_PORT,
+                         'database' => DB_NAME
+                         );
         }
 

branches/version-2_12-dev/data/class/db/SC_DB_DBFactory.php

@@ -53 +53 @@
      * データソース名を取得する.
      *
-     * 引数 $dsn が空の場合は, DEFAULT_DSN の値を返す.
+     * 引数 $dsn が空でデータソースが定義済みの場合はDB接続パラメータの連想配列を返す
      * DEFAULT_DSN が未定義の場合は void となる.
      * $dsn が空ではない場合は, $dsn の値を返す.
      *
-     * @param string $dsn データソース名
-     * @return void|string データソース名
+     * @param mixed $dsn データソース名
+     * @return mixed データソース名またはDB接続パラメータの連想配列
      */
     function getDSN($dsn = '') {
         if (empty($dsn)) {
             if (defined('DEFAULT_DSN')) {
-                $dsn = DEFAULT_DSN;
+                $dsn = array('phptype'  => DB_TYPE,
+                             'username' => DB_USER,
+                             'password' => DB_PASSWORD,
+                             'protocol' => 'tcp',
+                             'hostspec' => DB_SERVER,
+                             'port'     => DB_PORT,
+                             'database' => DB_NAME
+                             );
             } else {
                 return '';

branches/version-2_12-dev/data/mtb_constants_init.php

@@ -8 +8 @@
 /** ユーザファイル保存先 */
 define('USER_REALDIR', HTML_REALDIR . USER_DIR);
-/** 郵便番号専用DB */
-define('ZIP_DSN', DEFAULT_DSN);
 /** ユーザー作成ページ等 */
 define('USER_URL', HTTP_URL . USER_DIR);

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

@@ -1015 +1015 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('USER_DIR', '"user_data/"', 3, 'ユーザファイル保存先');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('USER_REALDIR', 'HTML_REALDIR . USER_DIR', 4, 'ユーザファイル保存先');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ZIP_DSN', 'DEFAULT_DSN', 8, '郵便番号専用DB');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('USER_URL', 'HTTP_URL . USER_DIR', 9, 'ユーザー作成ページ等');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('AUTH_TYPE', '"HMAC"', 10, '認証方式');