refactor sql formatter

Author: vincentlauvlwj

ktorm-core/src/main/kotlin/org/ktorm/expression/SqlFormatter.kt

@@ -540,36 +540,38 @@ public abstract class SqlFormatter(
     override fun visitInsert(expr: InsertExpression): InsertExpression {
         writeKeyword("insert into ")
         visitTable(expr.table)
-        write("(")
-
-        for ((i, assignment) in expr.assignments.withIndex()) {
-            if (i > 0) write(", ")
-            checkColumnName(assignment.column.name)
-            write(assignment.column.name.quoted)
-        }
-
-        writeKeyword(") values (")
-        visitExpressionList(expr.assignments.map { it.expression as ArgumentExpression })
-        removeLastBlank()
-        write(") ")
+        writeInsertColumnNames(expr.assignments.map { it.column })
+        writeKeyword("values ")
+        writeInsertValues(expr.assignments)
         return expr
     }
 
     override fun visitInsertFromQuery(expr: InsertFromQueryExpression): InsertFromQueryExpression {
         writeKeyword("insert into ")
         visitTable(expr.table)
+        writeInsertColumnNames(expr.columns)
+        newLine(Indentation.SAME)
+        visitQuery(expr.query)
+        return expr
+    }
+
+    protected fun writeInsertColumnNames(columns: List<ColumnExpression<*>>) {
         write("(")
 
-        for ((i, column) in expr.columns.withIndex()) {
+        for ((i, column) in columns.withIndex()) {
             if (i > 0) write(", ")
             checkColumnName(column.name)
             write(column.name.quoted)
         }
 
         write(") ")
-        newLine(Indentation.SAME)
-        visitQuery(expr.query)
-        return expr
+    }
+
+    protected fun writeInsertValues(assignments: List<ColumnAssignmentExpression<*>>) {
+        write("(")
+        visitExpressionList(assignments.map { it.expression as ArgumentExpression })
+        removeLastBlank()
+        write(") ")
     }
 
     override fun visitUpdate(expr: UpdateExpression): UpdateExpression {

ktorm-support-mysql/src/main/kotlin/org/ktorm/support/mysql/MySqlDialect.kt

@@ -77,16 +77,9 @@ public open class MySqlFormatter(
     protected open fun visitInsertOrUpdate(expr: InsertOrUpdateExpression): InsertOrUpdateExpression {
         writeKeyword("insert into ")
         visitTable(expr.table)
-        write("(")
-
-        for ((i, assignment) in expr.assignments.withIndex()) {
-            if (i > 0) write(", ")
-            checkColumnName(assignment.column.name)
-            write(assignment.column.name.quoted)
-        }
-
-        writeKeyword(") values ")
-        writeValues(expr.assignments)
+        writeInsertColumnNames(expr.assignments.map { it.column })
+        writeKeyword("values ")
+        writeInsertValues(expr.assignments)
 
         if (expr.updateAssignments.isNotEmpty()) {
             writeKeyword("on duplicate key update ")
@@ -99,22 +92,15 @@ public open class MySqlFormatter(
     protected open fun visitBulkInsert(expr: BulkInsertExpression): BulkInsertExpression {
         writeKeyword("insert into ")
         visitTable(expr.table)
-        write("(")
-
-        for ((i, assignment) in expr.assignments[0].withIndex()) {
-            if (i > 0) write(", ")
-            checkColumnName(assignment.column.name)
-            write(assignment.column.name.quoted)
-        }
-
-        writeKeyword(") values ")
+        writeInsertColumnNames(expr.assignments[0].map { it.column })
+        writeKeyword("values ")
 
         for ((i, assignments) in expr.assignments.withIndex()) {
             if (i > 0) {
                 removeLastBlank()
                 write(", ")
             }
-            writeValues(assignments)
+            writeInsertValues(assignments)
         }
 
         if (expr.updateAssignments.isNotEmpty()) {
@@ -125,13 +111,6 @@ public open class MySqlFormatter(
         return expr
     }
 
-    private fun writeValues(assignments: List<ColumnAssignmentExpression<*>>) {
-        write("(")
-        visitExpressionList(assignments.map { it.expression as ArgumentExpression })
-        removeLastBlank()
-        write(") ")
-    }
-
     protected open fun visitNaturalJoin(expr: NaturalJoinExpression): NaturalJoinExpression {
         visitQuerySource(expr.left)
         newLine(Indentation.SAME)

ktorm-support-postgresql/src/main/kotlin/org/ktorm/support/postgresql/PostgreSqlDialect.kt

@@ -149,13 +149,13 @@ public open class PostgreSqlFormatter(
     protected open fun visitInsertOrUpdate(expr: InsertOrUpdateExpression): InsertOrUpdateExpression {
         writeKeyword("insert into ")
         visitTable(expr.table)
-        writeColumnNames(expr.assignments.map { it.column })
+        writeInsertColumnNames(expr.assignments.map { it.column })
         writeKeyword("values ")
-        writeValues(expr.assignments)
+        writeInsertValues(expr.assignments)
 
         if (expr.updateAssignments.isNotEmpty()) {
             writeKeyword("on conflict ")
-            writeColumnNames(expr.conflictColumns)
+            writeInsertColumnNames(expr.conflictColumns)
             writeKeyword("do update set ")
             visitColumnAssignments(expr.updateAssignments)
         }
@@ -166,45 +166,26 @@ public open class PostgreSqlFormatter(
     protected open fun visitBulkInsert(expr: BulkInsertExpression): BulkInsertExpression {
         writeKeyword("insert into ")
         visitTable(expr.table)
-        writeColumnNames(expr.assignments[0].map { it.column })
+        writeInsertColumnNames(expr.assignments[0].map { it.column })
         writeKeyword("values ")
 
         for ((i, assignments) in expr.assignments.withIndex()) {
             if (i > 0) {
                 removeLastBlank()
                 write(", ")
             }
-            writeValues(assignments)
+            writeInsertValues(assignments)
         }
 
         if (expr.updateAssignments.isNotEmpty()) {
             writeKeyword("on conflict ")
-            writeColumnNames(expr.conflictColumns)
+            writeInsertColumnNames(expr.conflictColumns)
             writeKeyword("do update set ")
             visitColumnAssignments(expr.updateAssignments)
         }
 
         return expr
     }
-
-    private fun writeColumnNames(columns: List<ColumnExpression<*>>) {
-        write("(")
-
-        for ((i, column) in columns.withIndex()) {
-            if (i > 0) write(", ")
-            checkColumnName(column.name)
-            write(column.name.quoted)
-        }
-
-        write(") ")
-    }
-
-    private fun writeValues(assignments: List<ColumnAssignmentExpression<*>>) {
-        write("(")
-        visitExpressionList(assignments.map { it.expression as ArgumentExpression })
-        removeLastBlank()
-        write(") ")
-    }
 }
 
 /**