Changeset 4570

Timestamp:

10/15/07 21:01:31 (13 months ago)

Author:

inureyes

Message:

#711

• 쿼리 관련 명령을 단순하게 추상화.
  
• 결과값의 수를 얻는 경우는 DBQuery::queryCount로 간략화함.
  
• mysql.php에 속하는 함수를 일반화하고 해당 함수 삭제
  
• 데이터베이스 참조시 사용하는 쿼리 변경
  
• 세션 쿼리에서 mysql dependency를 줄임.
  

Location:

trunk

Files:

• components/Needlworks.DBMS.MySQL.php (modified) (1 diff)
• lib/database.php (modified) (1 diff)
• lib/function/mysql.php (deleted)
• lib/includeForBlog.php (modified) (1 diff)
• lib/includeForBlogOwner.php (modified) (1 diff)
• lib/includeForReader.php (modified) (1 diff)
• lib/session.php (modified) (10 diffs)

trunk/components/Needlworks.DBMS.MySQL.php

@@ -47 +47 @@
         $count = 0;
         if ($result = DBQuery::query($query)) {
-            $count = mysql_num_rows($result);
-            mysql_free_result($result);
+            if( stristr($query, 'select ')) {
+                $count = mysql_num_rows($result);
+                mysql_free_result($result);
+            } else if (stristr($query, 'insert ') ||
+            stristr($query, 'update ') ||
+            stristr($query, 'delete ') ||
+            stristr($query, 'replace ') ) {
+                $count = mysql_affected_rows();
+            }
         }
         return $count;
     }
-    
+
     /*@static@*/
     function queryCell($query, $field = 0, $useCache=true) {

trunk/lib/database.php

@@ -9 +9 @@
     return DBQuery::escapeString($string, $link);
 }
+
+function escapeSearchString($str) {
+    return is_string($str) ? str_replace('_', '\_', str_replace('%', '\%', tc_escape_string($str))) : $str;
+}
+
+function doesExistTable($tablename)
+{
+    global $database;
+    static $tables = array();   
+    if( empty($tables) ) {
+        $escapename = escapeSearchString($database['prefix']);
+        $tables = DBQuery::queryColumn( "SHOW TABLES LIKE '{$escapename}%'" );
+    }
+    if( in_array( $tablename, $tables ) ) {
+        return true;
+    }
+    return false;
+}
 ?>

trunk/lib/includeForBlog.php

@@ -10 +10 @@
 require 'function/html.php';
 require 'function/xml.php';
-require 'function/mysql.php';
 require 'function/misc.php';
 require 'function/image.php';

trunk/lib/includeForBlogOwner.php

@@ -10 +10 @@
 require 'function/html.php';
 require 'function/xml.php';
-require 'function/mysql.php';
 require 'function/misc.php';
 require 'function/image.php';

trunk/lib/includeForReader.php

@@ -10 +10 @@
 require 'function/html.php';
 require 'function/xml.php';
-require 'function/mysql.php';
 require 'function/misc.php';
 require 'function/image.php';

trunk/lib/session.php

@@ -19 +19 @@
 function readSession($id) {
     global $database, $service;
-    if ($result = sessionQuery("SELECT data FROM {$database['prefix']}Sessions WHERE id = '$id' AND address = '{$_SERVER['REMOTE_ADDR']}' AND updated >= (UNIX_TIMESTAMP() - {$service['timeout']})")) {
-        if ($session = mysql_fetch_array($result))
-            return $session['data'];
+    if ($result = sessionQuery("SELECT data FROM {$database['prefix']}Sessions 
+        WHERE id = '$id' AND address = '{$_SERVER['REMOTE_ADDR']}' AND updated >= (UNIX_TIMESTAMP() - {$service['timeout']})")) {
+        return $result;
     }
     return '';
@@ -38 +38 @@
     $referer = isset($_SERVER['HTTP_REFERER']) ? tc_escape_string($_SERVER['HTTP_REFERER']) : '';
     $timer = getMicrotimeAsFloat() - $sessionMicrotime;
-    $result = DBQuery::query("UPDATE {$database['prefix']}Sessions SET userid = $userid, data = '$data', server = '$server', request = '$request', referer = '$referer', timer = $timer, updated = UNIX_TIMESTAMP() WHERE id = '$id' AND address = '{$_SERVER['REMOTE_ADDR']}'");
-    if ($result && (mysql_affected_rows() == 1))
+    $result = DBQuery::queryCount("UPDATE {$database['prefix']}Sessions 
+            SET userid = $userid, data = '$data', server = '$server', request = '$request', referer = '$referer', timer = $timer, updated = UNIX_TIMESTAMP() 
+            WHERE id = '$id' AND address = '{$_SERVER['REMOTE_ADDR']}'");
+    if ($result && $result == 1)
         return true;
     return false;
@@ -46 +48 @@
 function destroySession($id, $setCookie = false) {
     global $database;
-    @DBQuery::query("DELETE FROM {$database['prefix']}Sessions WHERE id = '$id' AND address = '{$_SERVER['REMOTE_ADDR']}'");
+    @DBQuery::query("DELETE FROM {$database['prefix']}Sessions 
+        WHERE id = '$id' AND address = '{$_SERVER['REMOTE_ADDR']}'");
     gcSession();
 }
@@ -52 +55 @@
 function gcSession($maxLifeTime = false) {
     global $database, $service;
-    @DBQuery::query("DELETE FROM {$database['prefix']}Sessions WHERE updated < (UNIX_TIMESTAMP() - {$service['timeout']})");
-    $result = @sessionQuery("SELECT DISTINCT v.id, v.address FROM {$database['prefix']}SessionVisits v LEFT JOIN {$database['prefix']}Sessions s ON v.id = s.id AND v.address = s.address WHERE s.id IS NULL AND s.address IS NULL");
+    @DBQuery::query("DELETE FROM {$database['prefix']}Sessions 
+        WHERE updated < (UNIX_TIMESTAMP() - {$service['timeout']})");
+    $result = @sessionQueryAll("SELECT DISTINCT v.id, v.address 
+        FROM {$database['prefix']}SessionVisits v 
+        LEFT JOIN {$database['prefix']}Sessions s ON v.id = s.id AND v.address = s.address 
+        WHERE s.id IS NULL AND s.address IS NULL");
     if ($result) {
         $gc = array();
-        while ($g = mysql_fetch_row($result))
+        foreach ($result as $g)
             array_push($gc, $g);
         foreach ($gc as $g)
@@ -67 +74 @@
     global $database;
     $result = sessionQuery("SELECT id FROM {$database['prefix']}Sessions WHERE address = '{$_SERVER['REMOTE_ADDR']}' AND userid IS NULL AND preexistence IS NULL");
-    if ($result && (list($id) = mysql_fetch_array($result)))
-        return $id;
+    if ($result)
+        return $result;
     return false;
 }
@@ -78 +85 @@
             return $id;
         $id = dechex(rand(0x10000000, 0x7FFFFFFF)) . dechex(rand(0x10000000, 0x7FFFFFFF)) . dechex(rand(0x10000000, 0x7FFFFFFF)) . dechex(rand(0x10000000, 0x7FFFFFFF));
-        DBQuery::query("INSERT INTO {$database['prefix']}Sessions(id, address, created, updated) VALUES('$id', '{$_SERVER['REMOTE_ADDR']}', UNIX_TIMESTAMP(), UNIX_TIMESTAMP())");
-        if (mysql_affected_rows() > 0)
+        $result = DBQuery::queryCount("INSERT INTO {$database['prefix']}Sessions(id, address, created, updated) VALUES('$id', '{$_SERVER['REMOTE_ADDR']}', UNIX_TIMESTAMP(), UNIX_TIMESTAMP())");
+        if ($result > 0)
             return $id;
     }
@@ -104 +111 @@
     for ($i = 0; ($i < 100) && !setSessionAnonymous(); $i++) {
         $id = dechex(rand(0x10000000, 0x7FFFFFFF)) . dechex(rand(0x10000000, 0x7FFFFFFF)) . dechex(rand(0x10000000, 0x7FFFFFFF)) . dechex(rand(0x10000000, 0x7FFFFFFF));
-        $result = DBQuery::query("INSERT INTO {$database['prefix']}Sessions(id, address, created, updated) SELECT DISTINCT '$id', '{$_SERVER['REMOTE_ADDR']}', UNIX_TIMESTAMP(), UNIX_TIMESTAMP())");
-        if (($result !== false) && (mysql_affected_rows() > 0)) {
+        $result = DBQuery::queryCount("INSERT INTO {$database['prefix']}Sessions(id, address, created, updated) SELECT DISTINCT '$id', '{$_SERVER['REMOTE_ADDR']}', UNIX_TIMESTAMP(), UNIX_TIMESTAMP())");
+        if ($result && $result > 0) {
             session_id($id);
             return true;
@@ -115 +122 @@
 function isSessionAuthorized($id) {
     global $database;
-    $result = DBQuery::query("select id from {$database['prefix']}Sessions where id = '$id' and address = '{$_SERVER['REMOTE_ADDR']}' and (userid is not null or preexistence is not null)");
-    if ($result && (mysql_num_rows($result) == 1))
+    $result = DBQuery::queryCell("SELECT id 
+        FROM {$database['prefix']}Sessions 
+        WHERE id = '$id' 
+            AND address = '{$_SERVER['REMOTE_ADDR']}' 
+            AND (userid IS NOT NULL OR preexistence IS NOT NULL)");
+    if ($result)
         return true;
     return false;
@@ -141 +152 @@
     for ($i = 0; $i < 100; $i++) {
         $id = dechex(rand(0x10000000, 0x7FFFFFFF)) . dechex(rand(0x10000000, 0x7FFFFFFF)) . dechex(rand(0x10000000, 0x7FFFFFFF)) . dechex(rand(0x10000000, 0x7FFFFFFF));
-        $result = DBQuery::query("INSERT INTO {$database['prefix']}Sessions(id, address, userid, created, updated) VALUES('$id', '{$_SERVER['REMOTE_ADDR']}', $userid, UNIX_TIMESTAMP(), UNIX_TIMESTAMP())");
-        if ($result && (mysql_affected_rows() == 1)) {
+        $result = DBQuery::queryCount("INSERT INTO {$database['prefix']}Sessions
+            (id, address, userid, created, updated) 
+            VALUES('$id', '{$_SERVER['REMOTE_ADDR']}', $userid, UNIX_TIMESTAMP(), UNIX_TIMESTAMP())");
+        if ($result && $result == 1) {
             @session_id($id);
             setcookie('TSSESSION', $id, 0, $session_cookie_path, $service['domain']);
@@ -153 +166 @@
 function sessionQuery($sql) {
     global $database, $sessionDBRepair;
-    $result = DBQuery::query($sql);
+    $result = DBQuery::queryCell($sql);
     if($result === false) {
         if (!isset($sessionDBRepair)) {     
             DBQuery::query("REPAIR TABLE {$database['prefix']}Sessions");
-            $result = DBQuery::query($sql);
+            $result = DBQuery::queryCell($sql);
+            $sessionDBRepair = true;
+        }
+    }
+    return $result;
+}
+
+function sessionQueryAll($sql) {
+    global $database, $sessionDBRepair;
+    $result = DBQuery::queryAll($sql);
+    if($result === false) {
+        if (!isset($sessionDBRepair)) {     
+            DBQuery::query("REPAIR TABLE {$database['prefix']}Sessions");
+            $result = DBQuery::queryAll($sql);
             $sessionDBRepair = true;
         }