From 424b398f4c676a112c0ff43f0a2eb19f5bee7be2 Mon Sep 17 00:00:00 2001 From: nicky6s Date: Sat, 17 Aug 2024 19:15:13 +0100 Subject: [PATCH 1/2] chore removing system.out.println lines + minor clean up --- .../sf/jsqlparser/statement/StatementSeparatorTest.java | 3 --- .../java/net/sf/jsqlparser/statement/alter/AlterTest.java | 7 +++---- .../java/net/sf/jsqlparser/statement/merge/MergeTest.java | 4 ---- .../net/sf/jsqlparser/statement/select/SelectTest.java | 7 ------- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/test/java/net/sf/jsqlparser/statement/StatementSeparatorTest.java b/src/test/java/net/sf/jsqlparser/statement/StatementSeparatorTest.java index f8b766300..7edbdc515 100644 --- a/src/test/java/net/sf/jsqlparser/statement/StatementSeparatorTest.java +++ b/src/test/java/net/sf/jsqlparser/statement/StatementSeparatorTest.java @@ -53,7 +53,6 @@ void testNewLineNotGoIssue() throws JSQLParserException { void testOracleBlock() throws JSQLParserException { String sqlStr = "BEGIN\n" + "\n" + "SELECT * FROM TABLE;\n" + "\n" + "END\n" + "/\n"; Statement statement = TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true); - System.out.println(statement); } @Test @@ -69,7 +68,6 @@ void testSOQLIncludes() throws JSQLParserException { String sqlStr = "select name,\ngoods from test_table where option includes ('option1', 'option2')"; Statement statement = TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true); - System.out.println(statement); } @Test @@ -77,6 +75,5 @@ void testSOQLExcludes() throws JSQLParserException { String sqlStr = "select name,\ngoods from test_table where option excludes ('option1', 'option2')"; Statement statement = TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true); - System.out.println(statement); } } diff --git a/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java b/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java index 36f510dbf..bc53cebd7 100644 --- a/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java +++ b/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java @@ -71,15 +71,14 @@ public void testAlterTableAddColumn_ColumnKeyWordImplicit() throws JSQLParserExc @Test public void testAlterTableBackBrackets() throws JSQLParserException { String sql = "ALTER TABLE tablename add column (field string comment 'aaaaa')"; - Statement statement = CCJSqlParserUtil.parse(sql); - Alter alter = (Alter) statement; - System.out.println(alter.toString()); + Alter alter = (Alter) assertSqlCanBeParsedAndDeparsed(sql); + assertEquals("tablename", alter.getTable().toString()); String sql2 = "ALTER TABLE tablename add column (field string comment 'aaaaa', field2 string comment 'bbbbb');"; Statement statement2 = CCJSqlParserUtil.parse(sql2); Alter alter2 = (Alter) statement2; - System.out.println(alter2.toString()); + assertEquals("tablename", alter2.getTable().toString()); } diff --git a/src/test/java/net/sf/jsqlparser/statement/merge/MergeTest.java b/src/test/java/net/sf/jsqlparser/statement/merge/MergeTest.java index 678b8e7f8..470b8c163 100644 --- a/src/test/java/net/sf/jsqlparser/statement/merge/MergeTest.java +++ b/src/test/java/net/sf/jsqlparser/statement/merge/MergeTest.java @@ -42,10 +42,6 @@ public void testOracleMergeIntoStatement() throws JSQLParserException { + " INSERT (B.employee_id, B.bonus)\n" + " VALUES (E.employee_id, E.salary * 0.05) "; - Statement statement = CCJSqlParserUtil.parse(sql); - - System.out.println(statement.toString()); - assertSqlCanBeParsedAndDeparsed(sql, true); } diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java index 3e7cd9fd4..6ef1fc163 100644 --- a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java +++ b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java @@ -4539,13 +4539,6 @@ public void testLongQualifiedNamesIssue763() throws JSQLParserException { "SELECT mongodb.test.test.intField, postgres.test.test.intField, postgres.test.test.datefield FROM mongodb.test.test JOIN postgres.postgres.test.test ON mongodb.test.test.intField = postgres.test.test.intField WHERE mongodb.test.test.intField = 123"); } - @Test - public void testLongQualifiedNamesIssue763_2() throws JSQLParserException { - Statement parse = CCJSqlParserUtil.parse(new StringReader( - "SELECT mongodb.test.test.intField, postgres.test.test.intField, postgres.test.test.datefield FROM mongodb.test.test JOIN postgres.postgres.test.test ON mongodb.test.test.intField = postgres.test.test.intField WHERE mongodb.test.test.intField = 123")); - System.out.println(parse.toString()); - } - @Test public void testSubQueryAliasIssue754() throws JSQLParserException { assertSqlCanBeParsedAndDeparsed( From 0503e3273576c8540cbc068bcf174ec5fd545106 Mon Sep 17 00:00:00 2001 From: nicky6s Date: Sat, 17 Aug 2024 19:16:25 +0100 Subject: [PATCH 2/2] formatting fixes via spotlessApply --- .../sf/jsqlparser/statement/alter/AlterTest.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java b/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java index bc53cebd7..2deb2abcc 100644 --- a/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java +++ b/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java @@ -1024,20 +1024,24 @@ public void testIssue1875() throws JSQLParserException { } @Test - public void testIssue2027() throws JSQLParserException{ + public void testIssue2027() throws JSQLParserException { String sql = "ALTER TABLE `foo_bar` ADD COLUMN `baz` text"; assertSqlCanBeParsedAndDeparsed(sql); - String sqlText = "ALTER TABLE `foo_bar` ADD COLUMN `baz` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL"; + String sqlText = + "ALTER TABLE `foo_bar` ADD COLUMN `baz` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL"; assertSqlCanBeParsedAndDeparsed(sqlText); - String sqlTinyText = "ALTER TABLE `foo_bar` ADD COLUMN `baz` tinytext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL"; + String sqlTinyText = + "ALTER TABLE `foo_bar` ADD COLUMN `baz` tinytext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL"; assertSqlCanBeParsedAndDeparsed(sqlTinyText); - String sqlMediumText = "ALTER TABLE `foo_bar` ADD COLUMN `baz` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL"; + String sqlMediumText = + "ALTER TABLE `foo_bar` ADD COLUMN `baz` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL"; assertSqlCanBeParsedAndDeparsed(sqlMediumText); - String sqlLongText = "ALTER TABLE `foo_bar` ADD COLUMN `baz` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL"; + String sqlLongText = + "ALTER TABLE `foo_bar` ADD COLUMN `baz` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL"; assertSqlCanBeParsedAndDeparsed(sqlLongText); } }