[#18] Properly pass ON CONFLICT column names through 'columnNameMapper' (#19)

Author: aboisvert

scalasql/query/src/OnConflict.scala

@@ -23,7 +23,11 @@ object OnConflict {
     protected def expr = WithSqlExpr.get(query)
     private[scalasql] def renderSql(ctx: Context) = {
       val str = Renderable.renderSql(query)(ctx)
-      str + sql" ON CONFLICT (${SqlStr.join(columns.map(c => SqlStr.raw(c.name)), SqlStr.commaSep)}) DO NOTHING"
+      val columnsStr = SqlStr.join(
+        columns.map(c => SqlStr.raw(ctx.config.columnNameMapper(c.name))),
+        SqlStr.commaSep
+      )
+      str + sql" ON CONFLICT ($columnsStr) DO NOTHING"
     }
 
     protected override def queryIsExecuteUpdate = true
@@ -43,9 +47,14 @@ object OnConflict {
     private[scalasql] def renderSql(ctx: Context) = {
       implicit val implicitCtx = Context.compute(ctx, Nil, Some(table))
       val str = Renderable.renderSql(query)
-      val columnsStr = SqlStr.join(columns.map(c => SqlStr.raw(c.name)), SqlStr.commaSep)
+      val columnsStr = SqlStr.join(
+        columns.map(c => SqlStr.raw(ctx.config.columnNameMapper(c.name))),
+        SqlStr.commaSep
+      )
       val updatesStr = SqlStr.join(
-        updates.map { case assign => SqlStr.raw(assign.column.name) + sql" = ${assign.value}" },
+        updates.map { case assign =>
+          SqlStr.raw(ctx.config.columnNameMapper(assign.column.name)) + sql" = ${assign.value}"
+        },
         SqlStr.commaSep
       )
       str + sql" ON CONFLICT (${columnsStr}) DO UPDATE SET $updatesStr"