Merge remote-tracking branch 'origin/upserts' into upserts

# Conflicts: # quill-core/src/main/scala/io/getquill/MirrorIdiom.scala # quill-core/src/main/scala/io/getquill/ast/Ast.scala # quill-core/src/main/scala/io/getquill/ast/StatefulTransformer.scala # quill-core/src/main/scala/io/getquill/ast/StatelessTransformer.scala # quill-core/src/main/scala/io/getquill/dsl/QueryDsl.scala # quill-core/src/main/scala/io/getquill/norm/BetaReduction.scala # quill-core/src/main/scala/io/getquill/norm/Normalize.scala # quill-core/src/main/scala/io/getquill/quotation/Liftables.scala # quill-core/src/main/scala/io/getquill/quotation/Parsing.scala # quill-core/src/main/scala/io/getquill/quotation/Unliftables.scala # quill-sql/src/main/scala/io/getquill/PostgresDialect.scala # quill-sql/src/main/scala/io/getquill/context/sql/idiom/SqlIdiom.scala # quill-sql/src/test/scala/io/getquill/context/sql/idiom/PostgresDialectSpec.scala
zio · Jul 14, 2017 · ae00e8a · ae00e8a
2 parents cbea464 + ddd201f
commit ae00e8a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/quill-core/src/main/scala/io/getquill/MirrorContext.scala b/quill-core/src/main/scala/io/getquill/MirrorContext.scala
@@ -59,6 +59,9 @@ class MirrorContext[Idiom <: BaseIdiom, Naming <: NamingStrategy]
   def executeActionConflict[O](string: String, prepare: Row => Row = identity, extractor: Row => O, returningColumn: String) =
     ActionReturningMirror[O](string, prepare(Row()), extractor, returningColumn)
 
+  def executeActionConflict[O](string: String, prepare: Row => Row = identity, extractor: Row => O, returningColumn: String) =
+    ActionReturningMirror[O](string, prepare(Row()), extractor, returningColumn)
+
   def executeBatchAction(groups: List[BatchGroup]) =
     BatchActionMirror {
       groups.map {

diff --git a/quill-core/src/main/scala/io/getquill/dsl/MetaDsl.scala b/quill-core/src/main/scala/io/getquill/dsl/MetaDsl.scala
@@ -43,4 +43,8 @@ trait MetaDsl extends MetaDslLowPriorityImplicits {
   trait UpsertMeta[T] {
     val expand: Quoted[(EntityQuery[T], T) => Upsert[T]]
   }
+
+  trait UpsertMeta[T] {
+    val expand: Quoted[(EntityQuery[T], T) => Upsert[T]]
+  }
 }