Skip to content

Commit af5073c

Browse files
committed
Improve ALTER TABLE CLEAR * format
1 parent 74e0ba3 commit af5073c

7 files changed

Lines changed: 30 additions & 15 deletions

parser/format.go

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,8 @@ func (a *AlterTableClearColumn) FormatSQL(formatter *Formatter) {
279279
}
280280
formatter.WriteExpr(a.ColumnName)
281281
if a.PartitionExpr != nil {
282-
formatter.WriteString(" IN ")
282+
formatter.Break()
283+
formatter.WriteString("IN ")
283284
formatter.WriteExpr(a.PartitionExpr)
284285
}
285286

@@ -292,7 +293,8 @@ func (a *AlterTableClearIndex) FormatSQL(formatter *Formatter) {
292293
}
293294
formatter.WriteExpr(a.IndexName)
294295
if a.PartitionExpr != nil {
295-
formatter.WriteString(" IN ")
296+
formatter.Break()
297+
formatter.WriteString("IN ")
296298
formatter.WriteExpr(a.PartitionExpr)
297299
}
298300

@@ -305,7 +307,8 @@ func (a *AlterTableClearProjection) FormatSQL(formatter *Formatter) {
305307
}
306308
formatter.WriteExpr(a.ProjectionName)
307309
if a.PartitionExpr != nil {
308-
formatter.WriteString(" IN ")
310+
formatter.Break()
311+
formatter.WriteString("IN ")
309312
formatter.WriteExpr(a.PartitionExpr)
310313
}
311314

@@ -380,7 +383,8 @@ func (a *AlterTableMaterializeIndex) FormatSQL(formatter *Formatter) {
380383
formatter.WriteByte(whitespace)
381384
formatter.WriteExpr(a.IndexName)
382385
if a.Partition != nil {
383-
formatter.WriteString(" IN ")
386+
formatter.Break()
387+
formatter.WriteString("IN ")
384388
formatter.WriteExpr(a.Partition)
385389
}
386390
}
@@ -394,7 +398,8 @@ func (a *AlterTableMaterializeProjection) FormatSQL(formatter *Formatter) {
394398
formatter.WriteByte(whitespace)
395399
formatter.WriteExpr(a.ProjectionName)
396400
if a.Partition != nil {
397-
formatter.WriteString(" IN ")
401+
formatter.Break()
402+
formatter.WriteString("IN ")
398403
formatter.WriteExpr(a.Partition)
399404
}
400405
}
@@ -534,11 +539,13 @@ func (a *AuthenticationClause) FormatSQL(formatter *Formatter) {
534539
formatter.WriteExpr(a.AuthValue)
535540
}
536541
if a.LdapServer != nil {
537-
formatter.WriteString(" WITH ldap SERVER ")
542+
formatter.Break()
543+
formatter.WriteString("WITH ldap SERVER ")
538544
formatter.WriteExpr(a.LdapServer)
539545
}
540546
if a.IsKerberos {
541-
formatter.WriteString(" WITH kerberos")
547+
formatter.Break()
548+
formatter.WriteString("WITH kerberos")
542549
if a.KerberosRealm != nil && a.KerberosRealm.Literal != "" {
543550
formatter.WriteString(" REALM ")
544551
formatter.WriteExpr(a.KerberosRealm)

parser/testdata/ddl/format/beautify/alter_table_clear_column.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ ALTER TABLE my_table CLEAR COLUMN my_column_name IN PARTITION partition_name;
33

44
-- Beautify SQL:
55
ALTER TABLE my_table
6-
CLEAR COLUMN my_column_name IN PARTITION partition_name;
6+
CLEAR COLUMN my_column_name
7+
IN PARTITION partition_name;

parser/testdata/ddl/format/beautify/alter_table_clear_index.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ ALTER TABLE my_table CLEAR INDEX my_index_name IN PARTITION partition_name;
33

44
-- Beautify SQL:
55
ALTER TABLE my_table
6-
CLEAR INDEX my_index_name IN PARTITION partition_name;
6+
CLEAR INDEX my_index_name
7+
IN PARTITION partition_name;

parser/testdata/ddl/format/beautify/alter_table_clear_projection.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ ALTER TABLE my_table CLEAR PROJECTION hello IN PARTITION partition_name;
33

44
-- Beautify SQL:
55
ALTER TABLE my_table
6-
CLEAR PROJECTION hello IN PARTITION partition_name;
6+
CLEAR PROJECTION hello
7+
IN PARTITION partition_name;

parser/testdata/ddl/format/beautify/alter_table_materialize_index.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ ALTER TABLE visits_order MATERIALIZE INDEX IF EXISTS user_name_index IN PARTITIO
55

66
-- Beautify SQL:
77
ALTER TABLE visits_order
8-
MATERIALIZE INDEX IF EXISTS user_name_index IN PARTITION '20240403';
8+
MATERIALIZE INDEX IF EXISTS user_name_index
9+
IN PARTITION '20240403';

parser/testdata/ddl/format/beautify/alter_table_materialize_projection.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ ALTER TABLE visits_order MATERIALIZE PROJECTION IF EXISTS user_name_projection I
55

66
-- Beautify SQL:
77
ALTER TABLE visits_order
8-
MATERIALIZE PROJECTION IF EXISTS user_name_projection IN PARTITION '20240403';
8+
MATERIALIZE PROJECTION IF EXISTS user_name_projection
9+
IN PARTITION '20240403';

parser/testdata/ddl/format/beautify/create_user.sql

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,14 @@ IDENTIFIED WITH plaintext_password BY 'password123';
6565
CREATE USER user8
6666
IDENTIFIED WITH sha256_password BY 'hash123';
6767
CREATE USER user9
68-
IDENTIFIED WITH ldap SERVER 'ldap_server';
68+
IDENTIFIED
69+
WITH ldap SERVER 'ldap_server';
6970
CREATE USER user10
70-
IDENTIFIED WITH kerberos;
71+
IDENTIFIED
72+
WITH kerberos;
7173
CREATE USER user11
72-
IDENTIFIED WITH kerberos REALM 'EXAMPLE.COM';
74+
IDENTIFIED
75+
WITH kerberos REALM 'EXAMPLE.COM';
7376
CREATE USER user12
7477
HOST LOCAL;
7578
CREATE USER user13

0 commit comments

Comments
 (0)