From 6cb757797b039e0981616b92175f50eb3c67e0f1 Mon Sep 17 00:00:00 2001
From: Sergey Tsalkov <stsalkov@gmail.com>
Date: Tue, 19 Mar 2013 11:20:20 -0700
Subject: [PATCH] minor fix for calculated columns with fullcolumns

---
 db.class.php             | 3 ++-
 simpletest/BasicTest.php | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/db.class.php b/db.class.php
index 5b8a7b2..f05a9b5 100644
--- a/db.class.php
+++ b/db.class.php
@@ -616,7 +616,8 @@ class MeekroDB {
     if ($full_names) {
       $infos = array();
       foreach ($result->fetch_fields() as $info) {
-        $infos[] = $info->table . '.' . $info->name;
+        if (strlen($info->table)) $infos[] = $info->table . '.' . $info->name;
+        else $infos[] = $info->name;
       }
     }
 
diff --git a/simpletest/BasicTest.php b/simpletest/BasicTest.php
index 61fa88a..1515f70 100644
--- a/simpletest/BasicTest.php
+++ b/simpletest/BasicTest.php
@@ -352,13 +352,14 @@ class BasicTest extends SimpleTest {
     ));
     DB::query("UPDATE accounts SET profile_id=1 WHERE id=2");
 
-    $r = DB::queryFullColumns("SELECT accounts.*, profile.* FROM accounts
+    $r = DB::queryFullColumns("SELECT accounts.*, profile.*, 1+1 FROM accounts
       INNER JOIN profile ON accounts.profile_id=profile.id");
 
     $this->assert(count($r) === 1);
     $this->assert($r[0]['accounts.id'] === '2');
     $this->assert($r[0]['profile.id'] === '1');
     $this->assert($r[0]['profile.signature'] === 'u_suck');
+    $this->assert($r[0]['1+1'] === '2');
   }
 
 }