From 929aa3f88643f4e4746e6016f9ad962b727bce2c Mon Sep 17 00:00:00 2001 From: Tim Gushue Date: Mon, 14 Nov 2016 17:06:15 -0800 Subject: TM-251 bug(no default table import) createModel will gen whole DB if codegenSchemaWhitelist is empty --- src/main/scala/NamespacedCodegen.scala | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/main/scala/NamespacedCodegen.scala b/src/main/scala/NamespacedCodegen.scala index d73fc3e..b435830 100644 --- a/src/main/scala/NamespacedCodegen.scala +++ b/src/main/scala/NamespacedCodegen.scala @@ -217,13 +217,17 @@ object SchemaParser { def createModel(jdbcProfile: JdbcProfile, mappedSchemas: Map[String, List[String]]): DBIO[Model] = { val allTables: DBIO[Vector[MTable]] = MTable.getTables - val filteredTables: DBIO[Vector[MTable]] = allTables.map( - (tables: Vector[MTable]) => tables.filter(table => - table.name.schema.flatMap(mappedSchemas.get).exists(ts => - ts.isEmpty || ts.contains(table.name.name)) + if (mappedSchemas.isEmpty) { + jdbcProfile.createModel(Some(allTables)) + } else { + val filteredTables: DBIO[Vector[MTable]] = allTables.map( + (tables: Vector[MTable]) => tables.filter(table => + table.name.schema.flatMap(mappedSchemas.get).exists(ts => + ts.isEmpty || ts.contains(table.name.name)) + ) ) - ) - jdbcProfile.createModel(Some(filteredTables)) + jdbcProfile.createModel(Some(filteredTables)) + } } } -- cgit v1.2.3