Skip to content

Commit a9b19c2

Browse files
Merge pull request #222 from scalikejdbc/update/scalafmt-core-3.0.8
Update scalafmt-core to 3.0.8
1 parent 62ab8d7 commit a9b19c2

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.0.7
1+
version = 3.0.8
22
trailingCommas = keep
33
docstrings.style = keep
44
indent.defnSite = 2

core/src/main/scala/scalikejdbc/async/AsyncConnectionPoolFactory.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ object AsyncConnectionPoolFactory extends AsyncConnectionPoolFactory {
6161
// Heroku MySQL
6262

6363
// issue #5 Error: database name is too long
64-
//val defaultProperties = """?useUnicode=yes&characterEncoding=UTF-8&connectionCollation=utf8_general_ci"""
64+
// val defaultProperties = """?useUnicode=yes&characterEncoding=UTF-8&connectionCollation=utf8_general_ci"""
6565
val defaultProperties = ""
6666
val addDefaultPropertiesIfNeeded = MysqlCustomProperties
6767
.findFirstMatchIn(url)

core/src/main/scala/scalikejdbc/async/internal/RowDataResultSet.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private[scalikejdbc] class RowDataResultSet(
6262
notvalid
6363

6464
override def clearWarnings(): Unit = {
65-
//noop
65+
// noop
6666
}
6767

6868
override def updateTimestamp(columnIndex: Int, x: Timestamp): Unit = notvalid

core/src/test/scala/parameterbinderfactory/Account.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ object AccountId {
1818
}
1919

2020
object Account extends SQLSyntaxSupport[Account] {
21-
//override def columnNames
21+
// override def columnNames
2222
def apply(s: SyntaxProvider[Account])(rs: WrappedResultSet): Account =
2323
apply(s.resultName)(rs)
2424

core/src/test/scala/parameterbinderfactory/Person.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ object PersonId {
1313
}
1414

1515
object Person extends SQLSyntaxSupport[Person] {
16-
//override def columnNames
16+
// override def columnNames
1717
def apply(p: SyntaxProvider[Person])(rs: WrappedResultSet): Person =
1818
apply(p.resultName)(rs)
1919

core/src/test/scala/sample/MySQLSampleSpec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ class MySQLSampleSpec
181181
column.isReactive -> false,
182182
column.createdAt -> createdTime
183183
)
184-
//.returningId
184+
// .returningId
185185
}.updateAndReturnGeneratedKey.future()
186186
}
187187
// the generated key should be found
@@ -276,7 +276,7 @@ class MySQLSampleSpec
276276
column.rating -> 2,
277277
column.isReactive -> false,
278278
column.createdAt -> createdTime
279-
) //.returningId
279+
) // .returningId
280280
).updateAndReturnGeneratedKey.future()
281281
}
282282
val generatedId = Await.result(generatedIdFuture, 5.seconds)

0 commit comments

Comments
 (0)