Merge remote-tracking branch 'upstream/master'

src/test/java/com/alibaba/druid/bvt/pool/profile/FailFastTest.java

@@ -8,6 +8,7 @@ import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.Assert;
 
+import com.alibaba.druid.pool.DataSourceNotAvailableException;
 import com.alibaba.druid.pool.DruidDataSource;
 
 import junit.framework.TestCase;
@@ -70,8 +71,9 @@ public class FailFastTest extends TestCase {
         connectStartLatch.await();
         
         latch.countDown();
-        
         connectEndLatch.await(3, TimeUnit.SECONDS);
+        SQLException ex = errorHolder.get();
+        Assert.assertTrue(ex instanceof DataSourceNotAvailableException);
     }
 
 }

src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest23.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 1999-2101 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.bvt.sql.mysql;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
+import com.alibaba.druid.sql.parser.Token;
+
+public class MySqlAlterTableTest23 extends TestCase {
+
+    public void test_alter_add_key() throws Exception {
+        String sql = "alter table xxxxx modify (xxx default '0');";
+        MySqlStatementParser parser = new MySqlStatementParser(sql);
+        SQLStatement stmt = parser.parseStatementList().get(0);
+        parser.match(Token.EOF);
+        String output = SQLUtils.toMySqlString(stmt);
+        Assert.assertEquals("ALTER TABLE xxxxx"
+        		+ "\n\tMODIFY COLUMN xxx DEFAULT '0'", output);
+    }
+}

src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest24.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 1999-2101 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.bvt.sql.mysql;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
+import com.alibaba.druid.sql.parser.Token;
+
+public class MySqlAlterTableTest24 extends TestCase {
+
+    public void test_alter_add_key() throws Exception {
+        String sql = "alter table xxxxx modify (f0 default '0',f1 default '0');";
+        MySqlStatementParser parser = new MySqlStatementParser(sql);
+        SQLStatement stmt = parser.parseStatementList().get(0);
+        parser.match(Token.EOF);
+        String output = SQLUtils.toMySqlString(stmt);
+        Assert.assertEquals("ALTER TABLE xxxxx"
+        		+ "\n\tMODIFY COLUMN f0 DEFAULT '0',"
+        		+ "\n\tMODIFY COLUMN f1 DEFAULT '0'", output);
+    }
+}