@@ -326,12 +326,27 @@ public ColumnParams withNullOrdering(NullOrdering nullOrdering) {
326326 public String toString () {
327327 StringBuilder builder = new StringBuilder (
328328 expression != null ? "(" + expression + ")" : columnName );
329+ appendParams (builder );
330+ appendCollation (builder );
331+ appendOperatorClass (builder );
332+ appendSortOrder (builder );
333+ appendNullOrdering (builder );
334+ return builder .toString ();
335+ }
336+
337+ private void appendParams (StringBuilder builder ) {
329338 if (params != null ) {
330339 builder .append (" " ).append (String .join (" " , params ));
331340 }
341+ }
342+
343+ private void appendCollation (StringBuilder builder ) {
332344 if (collation != null && !hasParam ("COLLATE" )) {
333345 builder .append (" COLLATE " ).append (collation );
334346 }
347+ }
348+
349+ private void appendOperatorClass (StringBuilder builder ) {
335350 if (operatorClass != null && !hasParam (operatorClass )) {
336351 builder .append (" " ).append (operatorClass );
337352 if (operatorClassParameters != null && !operatorClassParameters .isEmpty ()) {
@@ -340,13 +355,18 @@ public String toString() {
340355 operatorClassParameters , true , true ));
341356 }
342357 }
358+ }
359+
360+ private void appendSortOrder (StringBuilder builder ) {
343361 if (sortOrder != null && !hasParam (sortOrder .name ())) {
344362 builder .append (" " ).append (sortOrder );
345363 }
364+ }
365+
366+ private void appendNullOrdering (StringBuilder builder ) {
346367 if (nullOrdering != null && !hasParam ("NULLS" )) {
347368 builder .append (" NULLS " ).append (nullOrdering );
348369 }
349- return builder .toString ();
350370 }
351371
352372 private boolean hasParam (String expected ) {
0 commit comments