改进join方法和alias方法的解析 改进软删除的base方法

library/think/db/builder/Sqlsrv.php

@@ -61,17 +61,27 @@ class Sqlsrv extends Builder
     }
 
     /**
-     * 字段名分析
+     * 字段和表名处理
      * @access protected
      * @param string $key
+     * @param array  $options
      * @return string
      */
-    protected function parseKey($key)
+    protected function parseKey($key, $options = [])
     {
         $key = trim($key);
+        if (strpos($key, '.')) {
+            list($table, $key) = explode('.', $key, 2);
+            if (isset($options['alias'][$table])) {
+                $table = $options['alias'][$table];
+            }
+        }
         if (!is_numeric($key) && !preg_match('/[,\'\"\*\(\)\[.\s]/', $key)) {
             $key = '[' . $key . ']';
         }
+        if (isset($table)) {
+            $key = '[' . $table . '].' . $key;
+        }
         return $key;
     }