From 3d582c2cf3b50540f9990b04450772817b438dc1 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Wed, 10 Apr 2013 16:06:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BModel=E7=B1=BB=E7=9A=84getDbF?=
 =?UTF-8?q?ields=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Think/Model.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/Think/Model.php b/Think/Model.php
index bdc2dd19..62564725 100644
--- a/Think/Model.php
+++ b/Think/Model.php
@@ -231,7 +231,7 @@ class Model {
             }
         }
         // 分析表达式
-        $options    =   $this->_parseOptions();dump($this->fields);
+        $options    =   $this->_parseOptions();
         // 数据处理
         $data       =   $this->_facade($data);
         if(false === $this->_before_insert($data,$options)) {
@@ -934,24 +934,23 @@ class Model {
             $fields =   Cache::get(md5($this->getTableName()));
             if(!$fields) {
                 $fields =   $this->db->getFields($this->getTableName());
+                $this->fields   =   array_keys($fields);
                 foreach ($fields as $key=>$val){
                     // 记录字段类型
                     $type[$key]    =   $val['type'];
                     if($val['primary']) {
-                        $fields['_pk'] = $key;
+                        $this->fields['_pk'] = $key;
                     }
                 }
                 // 记录字段类型信息
-                $fields['_type'] =  $type;
-                Cache::set(md5($this->trueTableName),$fields);
-            }
-            if($fields) {
-                $this->fields   =   array_keys($fields);
-                $this->fields['_pk'] = $fields['_pk'];
-                $this->fields['_type']  =   $fields['_type'];
+                $this->fields['_type'] =  $type;
+                Cache::set(md5($this->trueTableName),$this->fields);
+                return array_keys($fields);
+            }else{
+                $this->fields   =   $fields;
+                unset($fields['_pk'],$fields['_type']);
                 return array_keys($fields);
             }
-            return false;
         }
     }