Skip to content

Commit 011c3f6

Browse files
committed
Remove try without catch.
The Scala 3 compiler reports a warning: ```scala -- [E002] Syntax Warning: /Users/matt/scalasql/scalasql/core/src/DbApi.scala:205:8 205 | try { | ^ | A try without catch or finally is equivalent to putting | its body in a block; no exceptions are handled. 206 | val res = stream(query, fetchSize, queryTimeoutSeconds)( 207 | qr.asInstanceOf[Queryable[Q, Seq[_]]], 208 | fileName, 209 | lineNum 210 | ) 211 | if (qr.isSingleRow(query)) { 212 | val results = res.take(2).toVector 213 | assert( 214 | results.size == 1, 215 | s"Single row query must return 1 result, not ${results.size}" 216 | ) 217 | results.head.asInstanceOf[R] 218 | } else { 219 | res.toVector.asInstanceOf[R] 220 | } 221 | } ```
1 parent 9ffeb06 commit 011c3f6

File tree

1 file changed

+13
-15
lines changed

1 file changed

+13
-15
lines changed

scalasql/core/src/DbApi.scala

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -202,22 +202,20 @@ object DbApi {
202202
.asInstanceOf[R]
203203
else if (qr.isExecuteUpdate(query)) updateSql(flattened).asInstanceOf[R]
204204
else {
205-
try {
206-
val res = stream(query, fetchSize, queryTimeoutSeconds)(
207-
qr.asInstanceOf[Queryable[Q, Seq[_]]],
208-
fileName,
209-
lineNum
205+
val res = stream(query, fetchSize, queryTimeoutSeconds)(
206+
qr.asInstanceOf[Queryable[Q, Seq[_]]],
207+
fileName,
208+
lineNum
209+
)
210+
if (qr.isSingleRow(query)) {
211+
val results = res.take(2).toVector
212+
assert(
213+
results.size == 1,
214+
s"Single row query must return 1 result, not ${results.size}"
210215
)
211-
if (qr.isSingleRow(query)) {
212-
val results = res.take(2).toVector
213-
assert(
214-
results.size == 1,
215-
s"Single row query must return 1 result, not ${results.size}"
216-
)
217-
results.head.asInstanceOf[R]
218-
} else {
219-
res.toVector.asInstanceOf[R]
220-
}
216+
results.head.asInstanceOf[R]
217+
} else {
218+
res.toVector.asInstanceOf[R]
221219
}
222220
}
223221
}

0 commit comments

Comments
 (0)