add env in jooq gradle for issue #722 (#735)

Co-authored-by: Santosh Arumugam <sanarumu@publicisgroupe.net> Co-authored-by: PeeAyBee <pavel_bortnik@epam.com>
reportportal · Mar 13, 2024 · 5d21e14 · 5d21e14
1 parent 57e5890
commit 5d21e14
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/jooq.gradle b/jooq.gradle
@@ -15,7 +15,7 @@ jooq {
             }
             database {
                 name = 'org.jooq.meta.postgres.PostgresDatabase'
-                inputSchema = 'public'
+                inputSchema = (hasDBSchema ? getProperty('DB_SCHEMA_POSTGRES') : 'public')
                 // ...
                 excludes = 'batch_.*|schema_migrations'
             }

diff --git a/project-properties.gradle b/project-properties.gradle
@@ -8,8 +8,10 @@ project.ext {
     publishRepo = "https://maven.pkg.github.com/reportportal/commons-dao"
     dependencyRepos = ["commons", "commons-rules", "commons-model", "commons-bom"]
     releaseMode = project.hasProperty("releaseMode")
-    scriptsUrl = commonScriptsUrl + (releaseMode ? getProperty('scripts.version') : 'master')
-    migrationsUrl = migrationsScriptsUrl + (releaseMode ? getProperty('migrations.version') : 'feature/settings')
+    hasDBSchema = project.hasProperty("DB_SCHEMA_POSTGRES")
+    scriptsUrl = commonScriptsUrl + (releaseMode ? getProperty('scripts.version') : 'develop')
+    migrationsUrl = migrationsScriptsUrl + (releaseMode ? getProperty('migrations.version') : 'develop')
+
     //TODO refactor with archive download
     testScriptsSrc = [
             (migrationsUrl + '/migrations/0_extensions.up.sql')                        : 'V001__extensions.sql',