From adcf463051100a8182388f76f66e81c9800433a6 Mon Sep 17 00:00:00 2001 From: wenshao Date: Sat, 21 May 2011 07:47:05 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=BE=93=E5=87=BA=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.alibabatech.com/svn/druid/trunk@175 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../dialect/mysql/visitor/MySqlOutputVisitor.java | 2 +- .../bvt/EncryptionAndCompressionFunctionsTest.java | 2 +- .../druid/sql/mysql/bvt/InsertSyntaxTest.java | 14 +++++++------- src/test/resources/bvt/parser/mysql-7.txt | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java index 9cc6aa1d4c..9ed538abaa 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java @@ -728,7 +728,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV if (x.getValuesList().size() != 0) { println(); - print("VALUES "); + print("VALUES"); println(); for (int i = 0, size = x.getValuesList().size(); i < size; ++i) { if (i != 0) { diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/EncryptionAndCompressionFunctionsTest.java b/src/test/java/com/alibaba/druid/sql/mysql/bvt/EncryptionAndCompressionFunctionsTest.java index bd5e8fbb0a..f743deb5e9 100644 --- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/EncryptionAndCompressionFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/sql/mysql/bvt/EncryptionAndCompressionFunctionsTest.java @@ -35,7 +35,7 @@ public class EncryptionAndCompressionFunctionsTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("INSERT INTO t VALUES (1, AES_ENCRYPT('text', 'password'));", text); + Assert.assertEquals("INSERT INTO t\nVALUES\n(1, AES_ENCRYPT('text', 'password'));", text); } public void test_1() throws Exception { diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/InsertSyntaxTest.java b/src/test/java/com/alibaba/druid/sql/mysql/bvt/InsertSyntaxTest.java index feb6364df1..e7c4dfe071 100644 --- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/InsertSyntaxTest.java +++ b/src/test/java/com/alibaba/druid/sql/mysql/bvt/InsertSyntaxTest.java @@ -35,7 +35,7 @@ public class InsertSyntaxTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("INSERT INTO tbl_name VALUES ();", text); + Assert.assertEquals("INSERT INTO tbl_name\nVALUES\n();", text); } public void test_1() throws Exception { @@ -46,7 +46,7 @@ public class InsertSyntaxTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("INSERT INTO tbl_name (col1, col2) VALUES (15, col1 * 2);", text); + Assert.assertEquals("INSERT INTO tbl_name\n\t(col1, col2)\nVALUES\n(15, col1 * 2);", text); } public void test_2() throws Exception { @@ -57,7 +57,7 @@ public class InsertSyntaxTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("INSERT INTO tbl_name (col1, col2) VALUES (col2 * 2, 15);", text); + Assert.assertEquals("INSERT INTO tbl_name\n\t(col1, col2)\nVALUES\n(col2 * 2, 15);", text); } public void test_3() throws Exception { @@ -68,7 +68,7 @@ public class InsertSyntaxTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("INSERT INTO tbl_name (a, b, c) VALUES (1, 2, 3), (4, 5, 6), (7, 8, 9);", text); + Assert.assertEquals("INSERT INTO tbl_name\n\t(a, b, c)\nVALUES\n(1, 2, 3), (4, 5, 6), (7, 8, 9);", text); } public void test_4() throws Exception { @@ -79,7 +79,7 @@ public class InsertSyntaxTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("INSERT INTO tbl_name (a, b, c) VALUES (1, 2, 3, 4, 5, 6, 7, 8, 9);", text); + Assert.assertEquals("INSERT INTO tbl_name\n\t(a, b, c)\nVALUES\n(1, 2, 3, 4, 5\n\t, 6, 7, 8, 9);", text); } public void test_5() throws Exception { @@ -90,7 +90,7 @@ public class InsertSyntaxTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("INSERT LOW_PRIORITY DELAYED HIGH_PRIORITY IGNORE INTO tbl_name (a, b, c) VALUES (1, 2, 3);", text); + Assert.assertEquals("INSERT LOW_PRIORITY DELAYED HIGH_PRIORITY IGNORE INTO tbl_name\n\t(a, b, c)\nVALUES\n(1, 2, 3);", text); } public void test_6() throws Exception { @@ -101,7 +101,7 @@ public class InsertSyntaxTest extends TestCase { String text = output(stmtList); - Assert.assertEquals("INSERT INTO tbl_name (a, b, c) VALUES (1, 2, 3) ON DUPLICATE KEY UPDATE c = c + 1;", text); + Assert.assertEquals("INSERT INTO tbl_name\n\t(a, b, c)\nVALUES\n(1, 2, 3) ON DUPLICATE KEY UPDATE c = c + 1;", text); } private String output(List stmtList) { diff --git a/src/test/resources/bvt/parser/mysql-7.txt b/src/test/resources/bvt/parser/mysql-7.txt index 30884d229e..e2919746ca 100644 --- a/src/test/resources/bvt/parser/mysql-7.txt +++ b/src/test/resources/bvt/parser/mysql-7.txt @@ -13,7 +13,7 @@ INSERT INTO accontexchangeinfo (a.id, a.sourceid, a.batchno, a.applicant, a.out_uid , a.in_uid, a.moneytype, a.amount, a.remark, a.gmt_create , a.gmt_modified) -VALUES +VALUES (SEQ_ACCONTEXCHANGEINFO.nextval, ?, ?, ?, ? , ?, ?, ?, ?, SYSDATE , SYSDATE)