From b32724fc7ac3d45de3635c1a8602e509179716f7 Mon Sep 17 00:00:00 2001 From: Stewart Stewart Date: Tue, 6 Sep 2016 08:01:20 -0700 Subject: Expect URI with dbconfig rather than hardcoding --- src/main/scala/CodegenPlugin.scala | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/main/scala/CodegenPlugin.scala') diff --git a/src/main/scala/CodegenPlugin.scala b/src/main/scala/CodegenPlugin.scala index b565e8a..3a09585 100644 --- a/src/main/scala/CodegenPlugin.scala +++ b/src/main/scala/CodegenPlugin.scala @@ -10,19 +10,17 @@ object CodegenPlugin extends AutoPlugin { dependencyClasspath in Compile, runner in Compile, streams) map { (dir, cp, r, s) => - val url = "jdbc:postgresql://postgres/ctig" - val jdbcDriver = "org.postgresql.Driver" - val slickDriver = "slick.driver.PostgresDriver" + // TODO Move this block into application.conf#slick.db.default.codegen val pkg = "dbmodels" val outputDir = (dir / "app" / pkg).getPath val fname = outputDir + "/Tables.scala" - // TODO: typesfname should be a parameter val typesfname = (file("shared") / "src" / "main" / "scala" / pkg / "rows" / "TableTypes.scala").getPath val schemas = "patients,portal,work_queues,confidential,case_accessioning,samples.samples,samples.subsamples,samples.shipment_preps,samples.collection_methods,experiments.experiments,experiments.exp_types,experiments.somatic_snvs_indels_filtered,samples.basic_diagnosis,samples.molecular_tests,samples.sample_pathology,samples.path_molecular_tests" - val user = "ctig_portal" - val password = "coolnurseconspiracyhandbook" - codegen.NamespacedCodegen.main( - Array( slickDriver, jdbcDriver, url, pkg, schemas, fname, typesfname, user, password)) + + val uri = new java.net.URI("#slick.db.default") + + codegen.NamespacedCodegen.run(uri, Some(outputDir), fname, typesfname, schemas) + Seq(file(fname)) } } -- cgit v1.2.3