Skip to content

[905229] Schema must be specified when generating Slick code for tables #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ZixuanZhang-96 merged 2 commits into from
Apr 18, 2025
Merged

[905229] Schema must be specified when generating Slick code for tables #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b49bd85
both schema and table name
ZixuanZhang-96 Apr 10, 2025
a03ac06
comments
ZixuanZhang-96 Apr 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions src/main/scala/com/github/tototoshi/sbt/slick/CodegenPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,16 @@ object CodegenPlugin extends sbt.AutoPlugin with PluginDBSupport {
lazy val slickCodegenIncludedTableTypes: SettingKey[Seq[String]] =
settingKey[Seq[String]]("Table types that slick schema can be generated for")

lazy val slickCodegenExcludedTables: SettingKey[Seq[String]] =
settingKey[Seq[String]]("Tables that should be excluded")
lazy val slickCodegenExcludedTables: SettingKey[Seq[(String, String)]] =
settingKey[Seq[(String, String)]](
"Tables that should be excluded" +
"\nkey is the schema name, value is the table name."
)

lazy val slickCodegenIncludedTables: SettingKey[Seq[String]] =
settingKey[Seq[String]](
"Tables that should be included. If this list is not nil, only the included tables minus excluded will be taken."
lazy val slickCodegenIncludedTables: SettingKey[Seq[(String, String)]] =
settingKey[Seq[(String, String)]](
"Tables that should be included. If this list is not nil, only the included tables minus excluded will be taken." +
"\nkey is the schema name, value is the table name."
)

/** Define a new configuration scope for slick code gen,
Expand Down Expand Up @@ -166,10 +170,21 @@ object CodegenPlugin extends sbt.AutoPlugin with PluginDBSupport {
throw new RuntimeException("Failed to run slick-codegen: " + e.getMessage, e)
}

def containsTable(seq: Seq[(String, String)], t: MTable): Boolean = {
seq.exists { case (schema, name) => t.name.schema.contains(schema) && t.name.name == name }
}

val tables = MTable
.getTables(None, None, None, Some(tableTypes))
.map(ts => ts.filter(t => included.isEmpty || (included contains t.name.name)))
.map(ts => ts.filterNot(t => excluded contains t.name.name))
.map (
ts =>
// only include specified tables
// if included is empty, then include all tables
// if included is not empty, then only include the specified tables
(if (included.isEmpty) ts else ts.filter(t => containsTable(included, t)))
Copy link

@huayangdu huayangdu Apr 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just curious why not just use two filters instead of this complex map..

Copy link
Author

@ZixuanZhang-96 ZixuanZhang-96 Apr 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no difference between using two maps each with a filter, and using one map with two filters.
comments added

// if excluded is not empty, then exclude the specified tables
.filterNot(t => containsTable(excluded, t))
)

val dbio = for {
m <- driver.createModel(Some(tables))
Expand Down
Loading