support table alias for postgresql bulk insert

Author: vincentlauvlwj

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

@@ -526,7 +526,9 @@ public abstract class SqlFormatter(
                 removeLastBlank()
                 write(", ")
             }
-            visitColumn(assignment.column)
+
+            checkColumnName(assignment.column.name)
+            write("${assignment.column.name.quoted} ")
             write("= ")
             visit(assignment.expression)
         }
@@ -536,7 +538,7 @@ public abstract class SqlFormatter(
 
     override fun visitInsert(expr: InsertExpression): InsertExpression {
         writeKeyword("insert into ")
-        visitTable(expr.table.copy(tableAlias = null))
+        visitTable(expr.table)
         write("(")
 
         for ((i, assignment) in expr.assignments.withIndex()) {
@@ -554,7 +556,7 @@ public abstract class SqlFormatter(
 
     override fun visitInsertFromQuery(expr: InsertFromQueryExpression): InsertFromQueryExpression {
         writeKeyword("insert into ")
-        visitTable(expr.table.copy(tableAlias = null))
+        visitTable(expr.table)
         write("(")
 
         for ((i, column) in expr.columns.withIndex()) {

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

@@ -76,7 +76,7 @@ public open class MySqlFormatter(
 
     protected open fun visitInsertOrUpdate(expr: InsertOrUpdateExpression): InsertOrUpdateExpression {
         writeKeyword("insert into ")
-        visitTable(expr.table.copy(tableAlias = null))
+        visitTable(expr.table)
         write("(")
 
         for ((i, assignment) in expr.assignments.withIndex()) {
@@ -98,7 +98,7 @@ public open class MySqlFormatter(
 
     protected open fun visitBulkInsert(expr: BulkInsertExpression): BulkInsertExpression {
         writeKeyword("insert into ")
-        visitTable(expr.table.copy(tableAlias = null))
+        visitTable(expr.table)
         write("(")
 
         for ((i, assignment) in expr.assignments[0].withIndex()) {

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

@@ -129,7 +129,7 @@ public fun <T : BaseTable<*>> Database.bulkInsert(
  * ```sql
  * insert into t_employee (id, name, job, salary, hire_date, department_id)
  * values (?, ?, ?, ?, ?, ?), (?, ?, ?, ?, ?, ?)
- * on conflict (id) do update set salary = salary + ?
+ * on conflict (id) do update set salary = t_employee.salary + ?
  * ```
  *
  * @since 3.3.0

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

@@ -68,7 +68,7 @@ public data class InsertOrUpdateExpression(
  *
  * ```sql
  * insert into t_employee (id, name, job, salary, hire_date, department_id) values (?, ?, ?, ?, ?, ?)
- * on conflict (id) do update set salary = salary + ?
+ * on conflict (id) do update set salary = t_employee.salary + ?
  * ```
  *
  * @since 2.7

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

@@ -67,6 +67,24 @@ public open class PostgreSqlFormatter(
         return result as ScalarExpression<T>
     }
 
+    override fun visitTable(expr: TableExpression): TableExpression {
+        if (expr.catalog != null && expr.catalog!!.isNotBlank()) {
+            write("${expr.catalog!!.quoted}.")
+        }
+        if (expr.schema != null && expr.schema!!.isNotBlank()) {
+            write("${expr.schema!!.quoted}.")
+        }
+
+        write("${expr.name.quoted} ")
+
+        if (expr.tableAlias != null && expr.tableAlias!!.isNotBlank()) {
+            writeKeyword("as ") // The 'as' keyword is required for update statements in PostgreSQL.
+            write("${expr.tableAlias!!.quoted} ")
+        }
+
+        return expr
+    }
+
     override fun writePagination(expr: QueryExpression) {
         newLine(Indentation.SAME)
 
@@ -179,24 +197,6 @@ public open class PostgreSqlFormatter(
         return expr
     }
 
-    override fun visitColumnAssignments(
-        original: List<ColumnAssignmentExpression<*>>
-    ): List<ColumnAssignmentExpression<*>> {
-        for ((i, assignment) in original.withIndex()) {
-            if (i > 0) {
-                removeLastBlank()
-                write(", ")
-            }
-
-            checkColumnName(assignment.column.name)
-            write("${assignment.column.name.quoted} ")
-            write("= ")
-            visit(assignment.expression)
-        }
-
-        return original
-    }
-
     private fun writeColumnNames(columns: List<ColumnExpression<*>>) {
         write("(")
 

ktorm-support-postgresql/src/test/kotlin/org/ktorm/support/postgresql/PostgreSqlTest.kt

@@ -16,7 +16,6 @@ import org.ktorm.schema.ColumnDeclaring
 import org.ktorm.schema.Table
 import org.ktorm.schema.int
 import org.ktorm.schema.varchar
-import org.postgresql.util.PSQLException
 import org.testcontainers.containers.PostgreSQLContainer
 import java.time.LocalDate
 import java.util.concurrent.ExecutionException
@@ -120,20 +119,18 @@ class PostgreSqlTest : BaseTest() {
             set(it.salary, 1000)
             set(it.hireDate, LocalDate.now())
             set(it.departmentId, 1)
-
-            onDuplicateKey {
+            onConflict {
                 set(it.salary, it.salary + 1000)
             }
         }
-        database.insertOrUpdate(Employees) {
+        database.insertOrUpdate(Employees.aliased("t")) {
             set(it.id, 5)
             set(it.name, "vince")
             set(it.job, "engineer")
             set(it.salary, 1000)
             set(it.hireDate, LocalDate.now())
             set(it.departmentId, 1)
-
-            onDuplicateKey(it.id) {
+            onConflict {
                 set(it.salary, it.salary + 1000)
             }
         }
@@ -166,7 +163,7 @@ class PostgreSqlTest : BaseTest() {
 
     @Test
     fun testBulkInsertOrUpdate() {
-        database.bulkInsertOrUpdate(Employees.aliased("t")) {
+        database.bulkInsertOrUpdate(Employees) {
             item {
                 set(it.id, 1)
                 set(it.name, "vince")