diff --git a/src/main/java/com/alibaba/druid/sql/SQLUtils.java b/src/main/java/com/alibaba/druid/sql/SQLUtils.java
index fca98cccab..54316c274c 100644
--- a/src/main/java/com/alibaba/druid/sql/SQLUtils.java
+++ b/src/main/java/com/alibaba/druid/sql/SQLUtils.java
@@ -46,6 +46,8 @@ import com.alibaba.druid.sql.dialect.postgresql.visitor.PGOutputVisitor;
 import com.alibaba.druid.sql.dialect.postgresql.visitor.PGSchemaStatVisitor;
 import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerOutputVisitor;
 import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerSchemaStatVisitor;
+import com.alibaba.druid.sql.dialect.teradata.visitor.TeradataOutputVisitor;
+import com.alibaba.druid.sql.dialect.teradata.visitor.TeradataSchemaStatVisitor;
 import com.alibaba.druid.sql.parser.ParserException;
 import com.alibaba.druid.sql.parser.SQLExprParser;
 import com.alibaba.druid.sql.parser.SQLParserUtils;
@@ -56,7 +58,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
 import com.alibaba.druid.support.logging.Log;
 import com.alibaba.druid.support.logging.LogFactory;
 import com.alibaba.druid.util.JdbcConstants;
-import com.alibaba.druid.util.JdbcUtils;
 import com.alibaba.druid.util.StringUtils;
 
 public class SQLUtils {
@@ -109,35 +110,35 @@ public class SQLUtils {
     }
 
     public static SQLExpr toMySqlExpr(String sql) {
-        return toSQLExpr(sql, JdbcUtils.MYSQL);
+        return toSQLExpr(sql, JdbcConstants.MYSQL);
     }
 
     public static String formatMySql(String sql) {
-        return format(sql, JdbcUtils.MYSQL);
+        return format(sql, JdbcConstants.MYSQL);
     }
     
     public static String formatMySql(String sql, FormatOption option) {
-        return format(sql, JdbcUtils.MYSQL, option);
+        return format(sql, JdbcConstants.MYSQL, option);
     }
 
     public static String formatOracle(String sql) {
-        return format(sql, JdbcUtils.ORACLE);
+        return format(sql, JdbcConstants.ORACLE);
     }
     
     public static String formatOracle(String sql, FormatOption option) {
-        return format(sql, JdbcUtils.ORACLE, option);
+        return format(sql, JdbcConstants.ORACLE, option);
     }
 
     public static String formatOdps(String sql) {
-        return format(sql, JdbcUtils.ODPS);
+        return format(sql, JdbcConstants.ODPS);
     }
     
     public static String formatOdps(String sql, FormatOption option) {
-        return format(sql, JdbcUtils.ODPS, option);
+        return format(sql, JdbcConstants.ODPS, option);
     }
 
     public static String formatSQLServer(String sql) {
-        return format(sql, JdbcUtils.SQL_SERVER);
+        return format(sql, JdbcConstants.SQL_SERVER);
     }
 
     public static String toOracleString(SQLObject sqlObject) {
@@ -173,7 +174,7 @@ public class SQLUtils {
     }
 
     public static String formatPGSql(String sql, FormatOption option) {
-        return format(sql, JdbcUtils.POSTGRESQL, option);
+        return format(sql, JdbcConstants.POSTGRESQL, option);
     }
 
     public static SQLExpr toSQLExpr(String sql, String dbType) {
@@ -344,7 +345,7 @@ public class SQLUtils {
     public static SQLASTOutputVisitor createFormatOutputVisitor(Appendable out, // 
                                                                 List<SQLStatement> statementList, //
                                                                 String dbType) {
-        if (JdbcUtils.ORACLE.equals(dbType) || JdbcUtils.ALI_ORACLE.equals(dbType)) {
+        if (JdbcConstants.ORACLE.equals(dbType) || JdbcConstants.ALI_ORACLE.equals(dbType)) {
             if (statementList == null || statementList.size() == 1) {
                 return new OracleOutputVisitor(out, false);
             } else {
@@ -352,27 +353,31 @@ public class SQLUtils {
             }
         }
 
-        if (JdbcUtils.MYSQL.equals(dbType) || //
-            JdbcUtils.MARIADB.equals(dbType) || //
-            JdbcUtils.H2.equals(dbType)) {
+        if (JdbcConstants.MYSQL.equals(dbType) //
+            || JdbcConstants.MARIADB.equals(dbType) //
+            || JdbcConstants.H2.equals(dbType)) {
             return new MySqlOutputVisitor(out);
         }
 
-        if (JdbcUtils.POSTGRESQL.equals(dbType)) {
+        if (JdbcConstants.POSTGRESQL.equals(dbType)) {
             return new PGOutputVisitor(out);
         }
 
-        if (JdbcUtils.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) {
+        if (JdbcConstants.SQL_SERVER.equals(dbType) || JdbcConstants.JTDS.equals(dbType)) {
             return new SQLServerOutputVisitor(out);
         }
 
-        if (JdbcUtils.DB2.equals(dbType)) {
+        if (JdbcConstants.DB2.equals(dbType)) {
             return new DB2OutputVisitor(out);
         }
 
-        if (JdbcUtils.ODPS.equals(dbType)) {
+        if (JdbcConstants.ODPS.equals(dbType)) {
             return new OdpsOutputVisitor(out);
         }
+        
+        if (JdbcConstants.TERADATA.equals(dbType)) {
+            return new TeradataOutputVisitor(out);
+        }
 
         return new SQLASTOutputVisitor(out);
     }
@@ -383,31 +388,35 @@ public class SQLUtils {
     }
 
     public static SchemaStatVisitor createSchemaStatVisitor(String dbType) {
-        if (JdbcUtils.ORACLE.equals(dbType) || JdbcUtils.ALI_ORACLE.equals(dbType)) {
+        if (JdbcConstants.ORACLE.equals(dbType) || JdbcConstants.ALI_ORACLE.equals(dbType)) {
             return new OracleSchemaStatVisitor();
         }
 
-        if (JdbcUtils.MYSQL.equals(dbType) || //
-            JdbcUtils.MARIADB.equals(dbType) || //
-            JdbcUtils.H2.equals(dbType)) {
+        if (JdbcConstants.MYSQL.equals(dbType) || //
+            JdbcConstants.MARIADB.equals(dbType) || //
+            JdbcConstants.H2.equals(dbType)) {
             return new MySqlSchemaStatVisitor();
         }
 
-        if (JdbcUtils.POSTGRESQL.equals(dbType)) {
+        if (JdbcConstants.POSTGRESQL.equals(dbType)) {
             return new PGSchemaStatVisitor();
         }
 
-        if (JdbcUtils.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) {
+        if (JdbcConstants.SQL_SERVER.equals(dbType) || JdbcConstants.JTDS.equals(dbType)) {
             return new SQLServerSchemaStatVisitor();
         }
 
-        if (JdbcUtils.DB2.equals(dbType)) {
+        if (JdbcConstants.DB2.equals(dbType)) {
             return new DB2SchemaStatVisitor();
         }
         
-        if (JdbcUtils.ODPS.equals(dbType)) {
+        if (JdbcConstants.ODPS.equals(dbType)) {
             return new OdpsSchemaStatVisitor();
         }
+        
+        if (JdbcConstants.TERADATA.equals(dbType)) {
+            return new TeradataSchemaStatVisitor();
+        }
 
         return new SchemaStatVisitor();
     }
@@ -647,3 +656,4 @@ public class SQLUtils {
         }
     }
 }
+
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/teradata/ast/TeradataObject.java b/src/main/java/com/alibaba/druid/sql/dialect/teradata/ast/TeradataObject.java
new file mode 100644
index 0000000000..22a0f6ce4e
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/sql/dialect/teradata/ast/TeradataObject.java
@@ -0,0 +1,7 @@
+package com.alibaba.druid.sql.dialect.teradata.ast;
+
+import com.alibaba.druid.sql.ast.SQLObject;
+
+public interface TeradataObject extends SQLObject {
+
+}
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/teradata/parser/TeradataExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/teradata/parser/TeradataExprParser.java
new file mode 100644
index 0000000000..d4c9d86f94
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/sql/dialect/teradata/parser/TeradataExprParser.java
@@ -0,0 +1,24 @@
+package com.alibaba.druid.sql.dialect.teradata.parser;
+
+import com.alibaba.druid.sql.parser.Lexer;
+import com.alibaba.druid.sql.parser.SQLExprParser;
+import com.alibaba.druid.util.JdbcConstants;
+
+public class TeradataExprParser extends SQLExprParser {
+
+    public final static String[] AGGREGATE_FUNCTIONS = { "AVG", "COUNT", "MAX", "MIN", "STDDEV", "SUM", "ROW_NUMBER" };
+
+    public TeradataExprParser(String sql){
+        this(new TeradataLexer(sql));
+        this.lexer.nextToken();
+        this.dbType = JdbcConstants.TERADATA;
+    }
+
+    public TeradataExprParser(Lexer lexer){
+        super(lexer);
+        this.aggregateFunctions = AGGREGATE_FUNCTIONS;
+        this.dbType = JdbcConstants.TERADATA;
+    }
+    
+
+}
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/teradata/parser/TeradataLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/teradata/parser/TeradataLexer.java
new file mode 100644
index 0000000000..ea117ac69e
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/sql/dialect/teradata/parser/TeradataLexer.java
@@ -0,0 +1,25 @@
+package com.alibaba.druid.sql.dialect.teradata.parser;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.alibaba.druid.sql.parser.Keywords;
+import com.alibaba.druid.sql.parser.Lexer;
+import com.alibaba.druid.sql.parser.Token;
+
+public class TeradataLexer extends Lexer {
+    public final static Keywords DEFAULT_PG_KEYWORDS;
+
+    static {
+        Map<String, Token> map = new HashMap<String, Token>();
+        map.putAll(Keywords.DEFAULT_KEYWORDS.getKeywords());
+        
+        DEFAULT_PG_KEYWORDS = new Keywords(map);
+    }
+    
+    public TeradataLexer(String input){
+        super(input);
+        super.keywods = DEFAULT_PG_KEYWORDS;
+    }
+
+}
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/teradata/parser/TeradataStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/teradata/parser/TeradataStatementParser.java
new file mode 100644
index 0000000000..a847102eee
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/sql/dialect/teradata/parser/TeradataStatementParser.java
@@ -0,0 +1,16 @@
+package com.alibaba.druid.sql.dialect.teradata.parser;
+
+import com.alibaba.druid.sql.parser.Lexer;
+import com.alibaba.druid.sql.parser.SQLStatementParser;
+
+public class TeradataStatementParser extends SQLStatementParser {
+
+    public TeradataStatementParser(String sql){
+        super(new TeradataExprParser(sql));
+    }
+
+    public TeradataStatementParser(Lexer lexer){
+        super(new TeradataExprParser(lexer));
+    }
+
+}
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/teradata/visitor/TeradataASTVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/teradata/visitor/TeradataASTVisitor.java
new file mode 100644
index 0000000000..a0bee2499b
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/sql/dialect/teradata/visitor/TeradataASTVisitor.java
@@ -0,0 +1,7 @@
+package com.alibaba.druid.sql.dialect.teradata.visitor;
+
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
+public interface TeradataASTVisitor extends SQLASTVisitor {
+
+}
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/teradata/visitor/TeradataASTVisitorAdapter.java b/src/main/java/com/alibaba/druid/sql/dialect/teradata/visitor/TeradataASTVisitorAdapter.java
new file mode 100644
index 0000000000..d6bc6a50b0
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/sql/dialect/teradata/visitor/TeradataASTVisitorAdapter.java
@@ -0,0 +1,7 @@
+package com.alibaba.druid.sql.dialect.teradata.visitor;
+
+import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter;
+
+public class TeradataASTVisitorAdapter extends SQLASTVisitorAdapter implements TeradataASTVisitor {
+
+}
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/teradata/visitor/TeradataOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/teradata/visitor/TeradataOutputVisitor.java
new file mode 100644
index 0000000000..dfc81f1f5c
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/sql/dialect/teradata/visitor/TeradataOutputVisitor.java
@@ -0,0 +1,11 @@
+package com.alibaba.druid.sql.dialect.teradata.visitor;
+
+import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor;
+
+public class TeradataOutputVisitor extends SQLASTOutputVisitor implements TeradataASTVisitor {
+
+    public TeradataOutputVisitor(Appendable appender){
+        super(appender);
+    }
+
+}
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/teradata/visitor/TeradataSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/teradata/visitor/TeradataSchemaStatVisitor.java
new file mode 100644
index 0000000000..efa2e33378
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/sql/dialect/teradata/visitor/TeradataSchemaStatVisitor.java
@@ -0,0 +1,13 @@
+package com.alibaba.druid.sql.dialect.teradata.visitor;
+
+import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
+import com.alibaba.druid.util.JdbcUtils;
+
+public class TeradataSchemaStatVisitor extends SchemaStatVisitor implements TeradataASTVisitor {
+
+    @Override
+    public String getDbType() {
+        return JdbcUtils.POSTGRESQL;
+    }
+
+}
diff --git a/src/main/java/com/alibaba/druid/util/JdbcConstants.java b/src/main/java/com/alibaba/druid/util/JdbcConstants.java
index cc47401dca..e76e071371 100644
--- a/src/main/java/com/alibaba/druid/util/JdbcConstants.java
+++ b/src/main/java/com/alibaba/druid/util/JdbcConstants.java
@@ -71,6 +71,9 @@ public interface JdbcConstants {
      */
     public static final String ODPS              = "odps";
     public static final String ODPS_DRIVER       = "com.aliyun.odps.jdbc.OdpsDriver";
+    
+    public static final String TERADATA          = "teradata";
+    public static final String TERADATA_DRIVER   = "com.teradata.jdbc.TeraDriver";
 
     /**
      * Log4JDBC
diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantDeleteTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantDeleteTest.java
index c631e7cb85..2e1f5715e5 100644
--- a/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantDeleteTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantDeleteTest.java
@@ -40,6 +40,8 @@ public class TenantDeleteTest extends TestCase {
     public void testMySql() throws Exception {
         WallProvider.setTenantValue(123);
         MySqlWallProvider provider = new MySqlWallProvider(config);
+        
+        WallProvider.setTenantValue("test");
         WallCheckResult checkResult = provider.check(sql);
         Assert.assertEquals(0, checkResult.getViolations().size());