Merge remote-tracking branch 'upstream/master'

src/main/java/com/alibaba/druid/proxy/jdbc/PreparedStatementProxyImpl.java

@@ -37,6 +37,7 @@ import java.sql.Timestamp;
 import java.sql.Types;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.HashMap;
 import java.util.Map;
 
 import com.alibaba.druid.proxy.jdbc.JdbcParameter.TYPE;
@@ -50,6 +51,7 @@ public class PreparedStatementProxyImpl extends StatementProxyImpl implements Pr
     protected final String            sql;
     private JdbcParameter[]           parameters     = new JdbcParameter[16];
     private int                       parametersSize = 0;
+    private Map<Integer, JdbcParameter> paramMap       = null;
 
     public PreparedStatementProxyImpl(ConnectionProxy connection, PreparedStatement statement, String sql, long id){
         super(connection, statement, id);
@@ -58,7 +60,14 @@ public class PreparedStatementProxyImpl extends StatementProxyImpl implements Pr
     }
 
     public Map<Integer, JdbcParameter> getParameters() {
-        return null;
+        if (paramMap == null) {
+            paramMap = new HashMap<Integer, JdbcParameter>(parametersSize);
+            for (int i = 0; i < parametersSize; ++i) {
+                paramMap.put(i, parameters[i]);
+            }
+        }
+  
+        return paramMap;
     }
 
     void setParameter(int jdbcIndex, JdbcParameter parameter) {
@@ -71,6 +80,10 @@ public class PreparedStatementProxyImpl extends StatementProxyImpl implements Pr
             parameters = Arrays.copyOf(parameters, parametersSize + 16);
         }
         parameters[index] = parameter;
+        
+        if (paramMap != null) {
+            paramMap = null;
+        }
     }
 
     public int getParametersSize() {

src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddIndex.java

@@ -20,6 +20,7 @@ import java.util.List;
 
 import com.alibaba.druid.sql.ast.SQLName;
 import com.alibaba.druid.sql.ast.SQLObjectImpl;
+import com.alibaba.druid.sql.parser.Token;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 
 public class SQLAlterTableAddIndex extends SQLObjectImpl implements SQLAlterTableItem {
@@ -33,6 +34,8 @@ public class SQLAlterTableAddIndex extends SQLObjectImpl implements SQLAlterTabl
     private String                           type;
 
     private String                           using;
+    
+    private String                           keyOrIndex = Token.INDEX.name;
 
     @Override
     protected void accept0(SQLASTVisitor visitor) {
@@ -79,4 +82,11 @@ public class SQLAlterTableAddIndex extends SQLObjectImpl implements SQLAlterTabl
         this.using = using;
     }
 
+    public String getKeyOrIndex() {
+        return keyOrIndex;
+    }
+
+    public void setKeyOrIndex(String keyOrIndex) {
+        this.keyOrIndex = keyOrIndex;
+    }
 }

src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java

@@ -2290,7 +2290,11 @@ public class MySqlStatementParser extends SQLStatementParser {
                         SQLAlterTableAddConstraint item = new SQLAlterTableAddConstraint(primaryKey);
                         stmt.getItems().add(item);
                     } else if (lexer.token() == Token.KEY) {
-                        throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
+                        // throw new ParserException("TODO " + lexer.token() +
+                        // " " + lexer.stringVal());
+                        SQLAlterTableAddIndex item = parseAlterTableAddIndex();
+                        item.setParent(stmt);
+                        stmt.getItems().add(item);
                     } else if (lexer.token() == Token.CONSTRAINT) {
                         lexer.nextToken();
                         SQLName constraintName = this.exprParser.name();

src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java

@@ -1521,7 +1521,7 @@ public class SQLExprParser extends SQLParser {
             if (lexer.token() == Token.KEY) {
                 lexer.nextToken();
             }
-            column.getConstraints().add(new SQLColumnPrimaryKey());
+            column.getConstraints().add(new SQLColumnUniqueKey());
             return parseColumnRest(column);
         }
 

src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java

@@ -1688,10 +1688,20 @@ public class SQLStatementParser extends SQLParser {
             item.setUnique(true);
             lexer.nextToken();
             if (lexer.token() == Token.INDEX) {
+                item.setKeyOrIndex(Token.INDEX.name);
+                lexer.nextToken();
+            } else if (lexer.token() == Token.KEY) {
+                item.setKeyOrIndex(Token.KEY.name);
                 lexer.nextToken();
             }
         } else {
-            accept(Token.INDEX);
+            if (lexer.token() == Token.INDEX) {
+                item.setKeyOrIndex(Token.INDEX.name);
+                accept(Token.INDEX);
+            } else if (lexer.token() == Token.KEY) {
+                item.setKeyOrIndex(Token.KEY.name);
+                accept(Token.KEY);
+            }
         }
 
         if (lexer.token() == Token.LPAREN) {

src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java

@@ -1990,7 +1990,8 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
             print("UNIQUE ");
         }
 
-        print("INDEX ");
+        print(x.getKeyOrIndex());
+        print(" ");
 
         if (x.getName() != null) {
             x.getName().accept(this);