Skip to content

Commit

Permalink
Merge pull request #313 from nafg/update/scalafmt-core-3.7.17
Browse files Browse the repository at this point in the history
Update scalafmt-core to 3.7.17
  • Loading branch information
mergify[bot] authored Dec 7, 2023
2 parents 8838ca7 + bb9056c commit 487ca72
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 16 deletions.
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.7.17
079bc559484a98c38cde71cb4441d92140e14546
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.7.1"
version = "3.7.17"
runner.dialect = scala213source3

maxColumn = 120
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,8 @@ trait BaseCodeGenerator {
)(implicit executionContext: ExecutionContext
): DBIO[String]

def codeString(
rules: GenerationRules,
slickProfileClassName: String
)(implicit executionContext: ExecutionContext
): DBIO[String] = codeString(rules, Class.forName(slickProfileClassName).asSubclass(classOf[JdbcProfile]))
def codeString(rules: GenerationRules, slickProfileClassName: String)(implicit executionContext: ExecutionContext)
: DBIO[String] = codeString(rules, Class.forName(slickProfileClassName).asSubclass(classOf[JdbcProfile]))

def doWriteToFile(
baseDir: Path,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,8 @@ trait GenerationRules {
* @see
* [[columnConfig]]
*/
def baseColumnDefault(
currentTableMetadata: TableMetadata,
all: Seq[TableMetadata]
): PartialFunction[MColumn, Term] = {
def baseColumnDefault(currentTableMetadata: TableMetadata, all: Seq[TableMetadata])
: PartialFunction[MColumn, Term] = {
case ColType(Types.BIT, "bool", Some(AsBoolean(b))) => Lit.Boolean(b)
case ColType(Types.INTEGER, _, Some(AsInt(i))) => Lit.Int(i)
case ColType(Types.DOUBLE, "float8", Some(AsDouble(d))) => Lit.Double(d)
Expand Down Expand Up @@ -145,10 +143,8 @@ trait GenerationRules {
columns = columnConfigs(currentTableMetadata, all)
)

def tableConfigs(
slickProfileClass: Class[_ <: JdbcProfile]
)(implicit ec: ExecutionContext
): DBIO[List[TableConfig]] = {
def tableConfigs(slickProfileClass: Class[_ <: JdbcProfile])(implicit ec: ExecutionContext)
: DBIO[List[TableConfig]] = {
val slickProfileInstance = slickProfileClass.getField("MODULE$").get(null).asInstanceOf[JdbcProfile]
for {
tables <- slickProfileInstance.defaultTables
Expand Down
6 changes: 4 additions & 2 deletions src/main/scala/slick/additions/AdditionsProfile.scala
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ trait AdditionsProfile { this: JdbcProfile =>
)(targetColumns: TT => P,
onUpdate: ForeignKeyAction = ForeignKeyAction.NoAction,
onDelete: ForeignKeyAction = ForeignKeyAction.NoAction
)(implicit unpackT: Shape[_ <: FlatShapeLevel, TT, U, _],
)(implicit
unpackT: Shape[_ <: FlatShapeLevel, TT, U, _],
unpackP: Shape[_ <: FlatShapeLevel, P, PU, _],
name: Name,
dbNameStyle: NameStyle
Expand All @@ -137,7 +138,8 @@ trait AdditionsProfile { this: JdbcProfile =>
def idx[A](
on: A,
unique: Boolean = false
)(implicit shape: Shape[_ <: FlatShapeLevel, A, _, _],
)(implicit
shape: Shape[_ <: FlatShapeLevel, A, _, _],
name: Name,
dbNameStyle: NameStyle
) = index(dbNameStyle.indexName(tableName, name.value), on, unique = unique)
Expand Down

0 comments on commit 487ca72

Please sign in to comment.