Merge branch 'master' into upgrades

Author: AndriusA

slick-postgres-driver/src/main/scala/org/hatdex/libs/dal/BaseSchemaMigrationImpl.scala

@@ -14,12 +14,12 @@ import com.typesafe.config.Config
 import liquibase.database.DatabaseFactory
 import liquibase.database.jvm.JdbcConnection
 import liquibase.resource.ClassLoaderResourceAccessor
-import liquibase.{ Contexts, LabelExpression, Liquibase }
-import org.slf4j.{ Logger => Slf4jLogger }
+import liquibase.{Contexts, LabelExpression, Liquibase}
+import org.slf4j.{Logger => Slf4jLogger}
 import slick.jdbc.JdbcProfile
 
 import scala.collection.JavaConverters._
-import scala.concurrent.{ ExecutionContext, Future, blocking }
+import scala.concurrent.{ExecutionContext, Future, blocking}
 import scala.util.Try
 
 /**

slick-postgres-driver/src/main/scala/org/hatdex/libs/dal/DatabaseCodeGenerator.scala

@@ -18,6 +18,14 @@ import scala.concurrent.Future
 import scala.util.{ Failure, Success }
 
 class DatabaseCodeGenerator(config: Config) {
+  protected def modelFuture(database: String, excludedTables: Seq[String]): Future[Model] = {
+    Database.forConfig(database, config).run {
+      MTable.getTables(None, None, None, Some(Seq("TABLE", "VIEW"))) //TABLE, and VIEW represent metadata, i.e. get database objects which are tables and views
+        .map(_.filterNot(t => excludedTables contains t.name.name))
+        .flatMap(HATPostgresProfile.createModelBuilder(_, ignoreInvalidDefaults = false).buildModel)
+    }
+  }
+
   def generate(outputDir: String, packageName: String, className: String = "Tables",
     database: String = "devdb", excludedTables: Seq[String] = Seq("databasechangelog", "databasechangeloglock")): Future[Unit] = {
 
@@ -37,12 +45,4 @@ class DatabaseCodeGenerator(config: Config) {
         case Failure(e) => println(s"Failed to write code to file: ${e.getMessage}")
       }
   }
-
-  protected def modelFuture(database: String, excludedTables: Seq[String]): Future[Model] = {
-    Database.forConfig(database, config).run {
-      MTable.getTables(None, None, None, Some(Seq("TABLE", "VIEW"))) //TABLE, and VIEW represent metadata, i.e. get database objects which are tables and views
-        .map(_.filterNot(t => excludedTables contains t.name.name))
-        .flatMap(HATPostgresProfile.createModelBuilder(_, ignoreInvalidDefaults = false).buildModel)
-    }
-  }
 }

slick-postgres-driver/src/main/scala/org/hatdex/libs/dal/HATPostgresProfile.scala

@@ -75,3 +75,6 @@ trait HATPostgresProfile extends ExPostgresProfile
 }
 
 object HATPostgresProfile extends HATPostgresProfile
+
+trait SlickPostgresDriver extends HATPostgresProfile
+object SlickPostgresDriver extends SlickPostgresDriver