kotlin-orm · antonydenyer · Dec 15, 2020
diff --git a/ktorm-core/src/main/kotlin/org/ktorm/expression/SqlFormatter.kt b/ktorm-core/src/main/kotlin/org/ktorm/expression/SqlFormatter.kt
@@ -535,7 +535,9 @@ public abstract class SqlFormatter(
 
     override fun visitInsert(expr: InsertExpression): InsertExpression {
         writeKeyword("insert into ")
-        write("${expr.table.name.quoted} (")
+        visit(expr.table)
+        write(" (")
+
         for ((i, assignment) in expr.assignments.withIndex()) {
             if (i > 0) write(", ")
             checkColumnName(assignment.column.name)
@@ -550,7 +552,8 @@ public abstract class SqlFormatter(
 
     override fun visitInsertFromQuery(expr: InsertFromQueryExpression): InsertFromQueryExpression {
         writeKeyword("insert into ")
-        write("${expr.table.name.quoted} (")
+        visit(expr.table)
+        write(" (")
         for ((i, column) in expr.columns.withIndex()) {
             if (i > 0) write(", ")
             checkColumnName(column.name)

diff --git a/ktorm-support-postgresql/src/test/kotlin/org/ktorm/support/postgresql/PostgreSqlTest.kt b/ktorm-support-postgresql/src/test/kotlin/org/ktorm/support/postgresql/PostgreSqlTest.kt
@@ -361,7 +361,7 @@ class PostgreSqlTest : BaseTest() {
     }
 
     @Test
-    fun testSchema() {
+    fun testSchemaUpdate() {
         val t = object : Table<Department>("t_department", catalog = postgres.databaseName, schema = "public") {
             val id = int("id").primaryKey().bindTo { it.id }
             val name = varchar("name").bindTo { it.name }
@@ -378,6 +378,22 @@ class PostgreSqlTest : BaseTest() {
         assert(database.sequenceOf(t.aliased("t")).mapTo(HashSet()) { it.name } == setOf("test", "finance"))
     }
 
+    @Test
+    fun testSchemaInsert() {
+        val t = object : Table<Department>("t_department", catalog = postgres.databaseName, schema = "public") {
+            val id = int("id").primaryKey().bindTo { it.id }
+            val name = varchar("name").bindTo { it.name }
+        }
+
+        database.insert(t) {
+            set(it.id, 1)
+            set(it.name, "test")
+        }
+
+        assert(database.sequenceOf(t).filter { it.id eq 1 }.mapTo(HashSet()) { it.name } == setOf("test"))
+        assert(database.sequenceOf(t.aliased("t")).mapTo(HashSet()) { it.name } == setOf("test", "finance"))
+    }
+
     @Test
     fun testMaxColumnNameLength() {
         val t = object : Table<Nothing>("t_long_name") {