Changeset 22856 for branches/version-2_13-dev/data/class/SC_Query.php

Timestamp:

2013/06/08 16:35:27 (13 years ago)

Author:

Seasoft

Message:

#2043 (typo修正・ソース整形・ソースコメントの改善 for 2.13.0)

• 主に空白・空白行の調整。もう少し整えたいが、一旦現状コミット。

File:

• branches/version-2_13-dev/data/class/SC_Query.php (modified) (38 diffs)

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

@@ -32 +32 @@
 class SC_Query
 {
-
     var $option = '';
     var $where = '';
@@ -52 +51 @@
     function __construct($dsn = '', $force_run = false, $new = false)
     {
-
         if ($dsn == '') {
             $dsn = array('phptype'  => DB_TYPE,
@@ -127 +125 @@
             return true;
         }
+
         return false;
     }
@@ -156 +155 @@
         $sql = "SELECT CASE WHEN EXISTS($sql_inner) THEN 1 ELSE 0 END";
         $res = $this->getOne($sql, $arrWhereVal);
+
         return (bool)$res;
     }
@@ -172 +172 @@
     {
         $sqlse = $this->getSql($cols, $from, $where, $arrWhereVal);
+
         return $this->getAll($sqlse, $arrWhereVal, $fetchmode);
     }
@@ -187 +188 @@
             echo $sql . ";<br />\n";
         }
+
         return $sql;
     }
@@ -256 +258 @@
     function doCallbackAll($cbFunc, $sql, $arrVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC)
     {
-
         $sql = $this->dbFactory->sfChangeMySQL($sql);
 
@@ -276 +277 @@
         }
         $sth->free();
+
         return $result;
     }
@@ -289 +291 @@
     function getAll($sql, $arrVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC)
     {
-
         $sql = $this->dbFactory->sfChangeMySQL($sql);
 
@@ -361 +362 @@
     {
         $this->option = $str;
+
         return $this;
     }
@@ -378 +380 @@
             $this->conn->setLimit($limit, $offset);
         }
+
         return $this;
     }
@@ -396 +399 @@
             $this->groupby = 'GROUP BY ' . $str;
         }
+
         return $this;
     }
@@ -414 +418 @@
             $this->where = $str;
         }
+
         return $this;
     }
@@ -432 +437 @@
             $this->where = $str;
         }
+
         return $this;
     }
@@ -448 +454 @@
         $this->where = $where;
         $this->arrWhereVal = $arrWhereVal;
+
         return $this;
     }
@@ -466 +473 @@
             $this->order = 'ORDER BY ' . $str;
         }
+
         return $this;
     }
@@ -482 +490 @@
             $this->conn->setLimit($limit);
         }
+
         return $this;
     }
@@ -498 +507 @@
             $this->conn->setLimit($this->conn->limit, $offset);
         }
+
         return $this;
     }
@@ -629 +639 @@
     {
         $ret = $this->get("MAX($col)", $table, $where, $arrWhereVal);
+
         return $ret;
     }
@@ -644 +655 @@
     {
         $ret = $this->get("MIN($col)", $table, $where, $arrWhereVal);
+
         return $ret;
     }
@@ -661 +673 @@
         // SQL文の実行
         $ret = $this->getOne($sqlse, $arrWhereVal);
+
         return $ret;
     }
@@ -673 +686 @@
     function getOne($sql, $arrVal = array())
     {
-
         $sql = $this->dbFactory->sfChangeMySQL($sql);
 
@@ -707 +719 @@
     function getRow($col, $table = '', $where = '', $arrWhereVal = array(), $fetchmode = MDB2_FETCHMODE_ASSOC)
     {
-
         $sql = $this->getSql($col, $table, $where, $arrWhereVal);
         $sql = $this->dbFactory->sfChangeMySQL($sql);
@@ -779 +790 @@
         }
         $ret = $this->query($sqlde, $arrWhereVal, false, null, MDB2_PREPARE_MANIP);
+
         return $ret;
     }
@@ -825 +837 @@
             $this->error("setVal -> createSequence [$seq_name] [$start]");
         }
+
         return $ret;
     }
@@ -842 +855 @@
     function query($n ,$arr = array(), $ignore_err = false, $types = null, $result_types = MDB2_PREPARE_RESULT)
     {
-
         $n = $this->dbFactory->sfChangeMySQL($n);
 
@@ -869 +881 @@
     {
         $objManager =& $this->conn->loadModule('Manager');
+
         return $objManager->listSequences();
     }
@@ -891 +904 @@
     {
         $objManager =& $this->conn->loadModule('Manager');
+
         return $objManager->listTableFields($table);
     }
@@ -903 +917 @@
     {
         $objManager =& $this->conn->loadModule('Manager');
+
         return $objManager->listTableIndexes($table);
     }
@@ -918 +933 @@
         $definition = $this->dbFactory->sfGetCreateIndexDefinition($table, $name, $definition);
         $objManager =& $this->conn->loadModule('Manager');
+
         return $objManager->createIndex($table, $name, $definition);
     }
@@ -930 +946 @@
     {
         $objManager =& $this->conn->loadModule('Manager');
+
         return $objManager->dropIndex($table, $name);
     }
@@ -942 +959 @@
     {
         $objManager =& $this->conn->loadModule('Reverse');
+
         return $objManager->tableInfo($table, NULL);
     }
@@ -977 +995 @@
             }
         }
+
         return $arrResults;
     }
@@ -996 +1015 @@
             $this->error($msg);
         }
+
         return $sth;
     }
@@ -1009 +1029 @@
     function execute(&$sth, $arrVal = array())
     {
-
         $arrStartInfo =& $this->lfStartDbTraceLog($sth, $arrVal);
         $affected =& $sth->execute((array)$arrVal);
@@ -1020 +1039 @@
         }
         $this->conn->last_query = stripslashes($sth->query);
+
         return $affected;
     }
@@ -1074 +1094 @@
     function getQueryDefsFields($n ,$arr = array(), $ignore_err = false, $types = null, $result_types = MDB2_PREPARE_RESULT)
     {
-
         $n = $this->dbFactory->sfChangeMySQL($n);
 
@@ -1171 +1190 @@
     {
         $key_str = serialize($dsn);
+
         return SC_Query_Ex::$arrPoolInstance[$key_str] = $objThis;
     }