@@ -161,31 +161,41 @@ public void setGroupByColumnReferences(List<Expression> list) {
161161
162162 @ Override
163163 public String toString () {
164- String sql = "SELECT " ;
165- sql += ((distinct != null ) ? "" + distinct + " " : "" );
166- sql += ((top != null ) ? "" + top + " " : "" );
167- sql += getStringList (selectItems );
164+ StringBuilder sql = new StringBuilder ("SELECT " );
165+ if (distinct != null ) {
166+ sql .append (distinct ).append (" " );
167+ }
168+ if (top != null ) {
169+ sql .append (top ).append (" " );
170+ }
171+ sql .append (getStringList (selectItems ));
168172 if (fromItem != null ) {
169- sql += " FROM " + fromItem ;
173+ sql . append ( " FROM " ). append ( fromItem ) ;
170174 if (joins != null ) {
171175 Iterator <Join > it = joins .iterator ();
172176 while (it .hasNext ()) {
173177 Join join = it .next ();
174178 if (join .isSimple ()) {
175- sql += ", " + join ;
179+ sql . append ( ", " ). append ( join ) ;
176180 } else {
177- sql += " " + join ;
181+ sql . append ( " " ). append ( join ) ;
178182 }
179183 }
180184 }
181185 // sql += getFormatedList(joins, "", false, false);
182- sql += ((where != null ) ? " WHERE " + where : "" );
183- sql += getFormatedList (groupByColumnReferences , "GROUP BY" );
184- sql += ((having != null ) ? " HAVING " + having : "" );
185- sql += orderByToString (orderByElements );
186- sql += ((limit != null ) ? limit + "" : "" );
186+ if (where != null ) {
187+ sql .append (" WHERE " ).append (where );
188+ }
189+ sql .append (getFormatedList (groupByColumnReferences , "GROUP BY" ));
190+ if (having != null ) {
191+ sql .append (" HAVING " ).append (having );
192+ }
193+ sql .append (orderByToString (orderByElements ));
194+ if (limit != null ) {
195+ sql .append (limit );
196+ }
187197 }
188- return sql ;
198+ return sql . toString () ;
189199 }
190200
191201 public static String orderByToString (List <OrderByElement > orderByElements ) {
0 commit comments