Changeset 18730 for branches/version-2_4/data

Timestamp:

2010/06/22 15:56:19 (14 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20100622064338-ekasobzhpbj6s62d

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php 15123@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fdb%2Fdbfactory%2FSC_DB_DBFactory_MYSQL.php

bzr:mapping-version:

v4

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20100622065616-4er7u9byyrttl3jj

bzr:revno:

1937

bzr:revprop:branch-nick:

branches/version-2_4

bzr:root:

branches/version-2_4

bzr:text-parents:

data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4:18388

bzr:timestamp:

2010-06-22 15:56:16.036000013 +0900

bzr:user-agent:

bzr2.1.1+bzr-svn1.0.2

svn:original-date:

2010-06-22T06:56:16.036000Z

Message:

merged r18679

• MySQL で SC_Query::select() を使用した場合, TRUNC 句の変換に失敗してしまう不具合修正(#750)

File:

• branches/version-2_4/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php (modified) (1 diff)

branches/version-2_4/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php

@@ -243 +243 @@
      */
     function sfChangeTrunc($sql){
-        $changesql = eregi_replace("( TRUNC)", " TRUNCATE", $sql);
-        return $changesql;
+        if (preg_match('/TRUNCATE/i', $sql)) {
+            return $sql;
+        }
+        return eregi_replace("( TRUNC)", " TRUNCATE", $sql);
     }