Skip to content

Commit eb08033

Browse files
committed
Add liftings to batch groups
1 parent db0bbe5 commit eb08033

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

quill-core/src/main/scala/io/getquill/AsyncMirrorContext.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ class AsyncMirrorContext[+Idiom <: BaseIdiom, +Naming <: NamingStrategy](
148148
)(executionInfo: ExecutionInfo, dc: Runner)(implicit ec: ExecutionContext) =
149149
Future {
150150
BatchActionReturningMirror[T](
151-
groups.map { case BatchGroupReturning(string, returningBehavior, prepare) =>
151+
groups.map { case BatchGroupReturning(string, returningBehavior, prepare, _) =>
152152
(string, returningBehavior, prepare.map(_(Row(), session)._2))
153153
},
154154
extractor,

quill-core/src/main/scala/io/getquill/MirrorContext.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class MirrorContext[+Idiom <: BaseIdiom, +Naming <: NamingStrategy](
139139
extractor: Extractor[T]
140140
)(info: ExecutionInfo, dc: Runner) =
141141
new BatchActionReturningMirror[T](
142-
groups.map { case BatchGroupReturning(string, returningBehavior, prepare) =>
142+
groups.map { case BatchGroupReturning(string, returningBehavior, prepare, _) =>
143143
(string, returningBehavior, prepare.map(_(Row(), session)._2))
144144
},
145145
extractor,

quill-doobie/src/main/scala/io/getquill/doobie/DoobieContextBase.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ trait DoobieContextBase[+Dialect <: SqlIdiom, +Naming <: NamingStrategy]
187187
)(
188188
info: ExecutionInfo,
189189
dc: Runner
190-
): ConnectionIO[List[A]] = groups.flatTraverse { case BatchGroupReturning(sql, returningBehavior, preps) =>
190+
): ConnectionIO[List[A]] = groups.flatTraverse { case BatchGroupReturning(sql, returningBehavior, preps, _) =>
191191
prepareConnections(returningBehavior)(sql) {
192192

193193
useConnection { implicit connection =>

quill-engine/src/main/scala/io/getquill/context/RowContext.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ trait RowContext {
1212
protected def identityExtractor[T]: Extractor[T] = _identityExtractor.asInstanceOf[Extractor[T]]
1313

1414
case class BatchGroup(string: String, prepare: List[Prepare], liftings: List[List[ScalarLift]])
15-
case class BatchGroupReturning(string: String, returningBehavior: ReturnAction, prepare: List[Prepare])
15+
case class BatchGroupReturning(string: String, returningBehavior: ReturnAction, prepare: List[Prepare], liftings: List[List[ScalarLift]])
1616

1717
type Prepare = (PrepareRow, Session) => (List[Any], PrepareRow)
1818
type Extractor[T] = (ResultRow, Session) => T

quill-jdbc/src/main/scala/io/getquill/context/jdbc/JdbcContextVerbExecute.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ trait JdbcContextVerbExecute[+Dialect <: SqlIdiom, +Naming <: NamingStrategy]
103103
extractor: Extractor[T]
104104
)(info: ExecutionInfo, dc: Runner): Result[List[T]] =
105105
withConnectionWrapped { conn =>
106-
groups.flatMap { case BatchGroupReturning(sql, returningBehavior, prepare) =>
106+
groups.flatMap { case BatchGroupReturning(sql, returningBehavior, prepare, _) =>
107107
val ps = prepareWithReturning(sql, conn, returningBehavior)
108108
logger.underlying.debug("Batch: {}", sql)
109109
prepare.foreach { f =>

quill-jdbc/src/main/scala/io/getquill/context/jdbc/SimplifiedContexts.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ trait SqliteExecuteOverride[+D <: SqliteDialect, +N <: NamingStrategy] extends J
8989
logger.underlying.warn(
9090
"Sqlite does not support Batch-Actions with returning-keys. Quill will attempt to emulate this function with single-row inserts inside a transaction but using this API is not recommended."
9191
)
92-
groups.flatMap { case BatchGroupReturning(sql, returningBehavior, prepare) =>
92+
groups.flatMap { case BatchGroupReturning(sql, returningBehavior, prepare, _) =>
9393
val ps = conn.prepareStatement(sql, java.sql.Statement.RETURN_GENERATED_KEYS)
9494
logger.underlying.debug("Batch: {}", sql)
9595
runInTransaction(conn) {
@@ -125,7 +125,7 @@ trait SqlServerExecuteOverride[+N <: NamingStrategy] extends JdbcContextVerbExec
125125
extractor: Extractor[T]
126126
)(info: ExecutionInfo, dc: Runner): Result[List[T]] =
127127
withConnectionWrapped { conn =>
128-
groups.flatMap { case BatchGroupReturning(sql, returningBehavior, prepare) =>
128+
groups.flatMap { case BatchGroupReturning(sql, returningBehavior, prepare, _) =>
129129
val ps = conn.prepareStatement(sql, java.sql.Statement.RETURN_GENERATED_KEYS)
130130
logger.underlying.debug("Batch: {}", sql)
131131
val outputs =

0 commit comments

Comments
 (0)