From cbe217066f286d20624d045bf1690350d3848a11 Mon Sep 17 00:00:00 2001 From: Stewart Stewart Date: Tue, 13 Sep 2016 10:59:05 -0700 Subject: organize imports --- src/main/scala/NamespacedCodegen.scala | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/src/main/scala/NamespacedCodegen.scala b/src/main/scala/NamespacedCodegen.scala index bdda76a..e9177a6 100644 --- a/src/main/scala/NamespacedCodegen.scala +++ b/src/main/scala/NamespacedCodegen.scala @@ -1,18 +1,20 @@ -import slick.dbio.{NoStream, DBIOAction} +import java.io.{FileWriter, File} +import java.net.URI import scala.concurrent.Await +import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.duration.Duration import scala.reflect.runtime.currentMirror + import slick.ast.ColumnOption +import slick.backend.DatabaseConfig +import slick.codegen.{AbstractGenerator, SourceCodeGenerator} +import slick.dbio.{DBIO, DBIOAction, NoStream} import slick.driver.JdbcProfile import slick.jdbc.meta.MTable -import slick.codegen.{AbstractGenerator, SourceCodeGenerator} -import slick.model._ import slick.{model => m} -import scala.concurrent.ExecutionContext.Implicits.global - -import java.io.File -import java.io.FileWriter +import slick.model.{Column, Model, Table} +import slick.util.ConfigExtensionMethods.configExtensionMethods // NamespacedCodegen handles tables within schemas by namespacing them // within objects here @@ -30,9 +32,6 @@ object NamespacedCodegen { mappedSchemas ++ mappedTables } - import slick.dbio.DBIO - import slick.model.Model - def createFilteredModel(driver: JdbcProfile, mappedSchemas: Map[String, List[String]]): DBIO[Model] = driver.createModel(Some( MTable.getTables.map(_.filter((t: MTable) => mappedSchemas @@ -52,11 +51,6 @@ object NamespacedCodegen { tcMappings.map{case (from, to) => ({getTableColumn(from); from}, getTableColumn(to))} } - - import java.net.URI - import slick.backend.DatabaseConfig - import slick.util.ConfigExtensionMethods.configExtensionMethods - def run( uri: URI, pkg: String, -- cgit v1.2.3