diff --git a/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java b/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java
index 5272ac30c4..1ff5ac18af 100644
--- a/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java
+++ b/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java
@@ -49,13 +49,7 @@ public class WallVisitorUtils {
     private final static Log LOG = LogFactory.getLog(WallVisitorUtils.class);
 
     public static void check(WallVisitor visitor, SQLPropertyExpr x) {
-        if (x.getOwner() instanceof SQLIdentifierExpr) {
-            String owner = x.getOwner().toString();
-            owner = WallVisitorUtils.form(owner);
-            if (visitor.getConfig().isPermitObjects(owner)) {
-                addViolation(visitor, x);
-            }
-        }
+        checkSchema(visitor, x.getOwner());
     }
 
     public static void checkInsert(WallVisitor visitor, SQLInsertInto x) {
@@ -132,12 +126,10 @@ public class WallVisitorUtils {
         if (tableSource instanceof SQLExprTableSource) {
             String tableName = null;
             SQLExpr tableNameExpr = ((SQLExprTableSource) tableSource).getExpr();
-            if (tableNameExpr instanceof SQLIdentifierExpr) {
-                tableName = tableNameExpr.toString();
-            } else if (tableNameExpr instanceof SQLPropertyExpr) {
-                tableName = ((SQLPropertyExpr) tableNameExpr).getName();
+            if (tableNameExpr instanceof SQLName) {
+                tableName = ((SQLName) tableNameExpr).getSimleName();
             }
-
+            
             if (tableName != null) {
                 tableName = form(tableName);
                 if (visitor.getConfig().getReadOnlyTables().contains(tableName)) {
@@ -437,13 +429,7 @@ public class WallVisitorUtils {
     }
 
     public static void checkFunction(WallVisitor visitor, SQLMethodInvokeExpr x) {
-        if (x.getOwner() instanceof SQLIdentifierExpr) {
-            String owner = x.getOwner().toString();
-            owner = WallVisitorUtils.form(owner);
-            if (visitor.getConfig().isPermitObjects(owner)) {
-                addViolation(visitor, x);
-            }
-        }
+        checkSchema(visitor, x.getOwner());
 
         if (!visitor.getConfig().isFunctionCheck()) {
             return;
@@ -457,32 +443,31 @@ public class WallVisitorUtils {
 
     }
 
+    private static void checkSchema(WallVisitor visitor, SQLExpr x) {
+        if (x instanceof SQLName) {
+            String owner = ((SQLName) x).getSimleName();
+            owner = WallVisitorUtils.form(owner);
+            if (visitor.getConfig().isPermitSchema(owner)) {
+                addViolation(visitor, x);
+            }
+        }
+        
+        //if (ownerExpr instanceof SQLPropertyExpr) {
+        if (x instanceof SQLPropertyExpr) {
+            checkSchema(visitor, ((SQLPropertyExpr) x).getOwner());
+        }
+    }
+
     public static void check(WallVisitor visitor, SQLExprTableSource x) {
         SQLExpr expr = x.getExpr();
 
-        String tableName = null;
+        
         if (expr instanceof SQLPropertyExpr) {
-            SQLPropertyExpr propExpr = (SQLPropertyExpr) expr;
-
-            if (propExpr.getOwner() instanceof SQLName) {
-                String ownerName = ((SQLName) propExpr.getOwner()).getSimleName();
-
-                ownerName = form(ownerName);
-
-                if (visitor.getConfig().getPermitSchemas().contains(ownerName.toLowerCase())) {
-                    addViolation(visitor, x);
-                }
-            }
-
-            tableName = propExpr.getName();
+            checkSchema(visitor, ((SQLPropertyExpr) expr).getOwner());
         }
 
-        if (expr instanceof SQLIdentifierExpr) {
-            tableName = ((SQLIdentifierExpr) expr).getName();
-        }
-
-        if (tableName != null) {
-            tableName = form(tableName);
+        if (expr instanceof SQLName) {
+            String tableName = ((SQLName) expr).getSimleName();
             if (visitor.isPermitTable(tableName)) {
                 addViolation(visitor, x);
             }
diff --git a/src/main/resources/META-INF/druid/wall/sqlserver/permit-schema.txt b/src/main/resources/META-INF/druid/wall/sqlserver/permit-schema.txt
index 8b25206ff9..1f7391f92b 100644
--- a/src/main/resources/META-INF/druid/wall/sqlserver/permit-schema.txt
+++ b/src/main/resources/META-INF/druid/wall/sqlserver/permit-schema.txt
@@ -1 +1 @@
-master
\ No newline at end of file
+master
diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest3.java
new file mode 100644
index 0000000000..bb5cad3b53
--- /dev/null
+++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest3.java
@@ -0,0 +1,27 @@
+package com.alibaba.druid.bvt.sql.sqlserver;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerStatementParser;
+import com.alibaba.druid.sql.test.TestUtils;
+
+public class SQLServerSelectTest3 extends TestCase {
+
+    public void test_isEmpty() throws Exception {
+        String sql = "SELECT name + ‘-’ + master.sys.fn_varbintohexstr(password_hash) from master.sys.sql_logins";
+
+        String expect = "SELECT name + ‘ - ’ + master.sys.fn_varbintohexstr(password_hash)\n" + //
+                        "FROM master.sys.sql_logins";
+
+        SQLServerStatementParser parser = new SQLServerStatementParser(sql);
+        SQLStatement stmt = parser.parseStatementList().get(0);
+
+        String text = TestUtils.outputSqlServer(stmt);
+
+        Assert.assertEquals(expect, text);
+
+        System.out.println(text);
+    }
+}
diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest4.java
new file mode 100644
index 0000000000..0587356900
--- /dev/null
+++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest4.java
@@ -0,0 +1,27 @@
+package com.alibaba.druid.bvt.sql.sqlserver;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerStatementParser;
+import com.alibaba.druid.sql.test.TestUtils;
+
+public class SQLServerSelectTest4 extends TestCase {
+
+    public void test_isEmpty() throws Exception {
+        String sql = "SELECT name, password_hash FROM master.sys.sql_logins";
+
+        String expect = "SELECT name, password_hash\n" + //
+                        "FROM master.sys.sql_logins";
+
+        SQLServerStatementParser parser = new SQLServerStatementParser(sql);
+        SQLStatement stmt = parser.parseStatementList().get(0);
+
+        String text = TestUtils.outputSqlServer(stmt);
+
+        Assert.assertEquals(expect, text);
+
+        System.out.println(text);
+    }
+}