diff --git a/buildit b/buildit index 212d4b2..309b63b 100644 --- a/buildit +++ b/buildit @@ -2,13 +2,13 @@ version=0.0.2 -./gradlew :covid19-model:clean :covid19-model:assemble +./gradlew :covid19-db-migrator:clean :covid19-db-migrator:assemble ./gradlew :covid19-api:clean :covid19-api:assemble ./gradlew :covid19-scheduler:clean :covid19-scheduler:assemble [ ! -d "build" ] && mkdir "build"; -cp "covid19-model/build/libs/covid19-model-$version.jar" "build/covid19-model-$version.jar" +cp "covid19-db-migrator/build/libs/covid19-db-migrator-$version.jar" "build/covid19-db-migrator-$version.jar" cp "covid19-api/build/libs/covid19-api-$version.jar" "build/covid19-api-$version.jar" cp "covid19-scheduler/build/libs/covid19-scheduler-$version.jar" "build/covid19-scheduler-$version.jar" diff --git a/covid19-api/src/main/resources/application.yaml b/covid19-api/src/main/resources/application.yaml index 64fab79..8bb9c31 100644 --- a/covid19-api/src/main/resources/application.yaml +++ b/covid19-api/src/main/resources/application.yaml @@ -15,8 +15,7 @@ spring: cache-names: covid-last-update-info, covid-stats-by-update-info-id flyway: - locations: classpath:db/migration - schemas: covid + enabled: false datasource: driver-class-name: org.postgresql.Driver diff --git a/covid19-db-migrator/.gitignore b/covid19-db-migrator/.gitignore new file mode 100644 index 0000000..ce3b48d --- /dev/null +++ b/covid19-db-migrator/.gitignore @@ -0,0 +1,35 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/** +!**/src/test/** + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +.gradle/ +gradle-old/ \ No newline at end of file diff --git a/covid19-db-migrator/build.gradle b/covid19-db-migrator/build.gradle new file mode 100644 index 0000000..8580a37 --- /dev/null +++ b/covid19-db-migrator/build.gradle @@ -0,0 +1,20 @@ +apply plugin: 'org.springframework.boot' + +version = '0.0.2' + +dependencies { + compile(project(':covid19-model')) + + implementation 'org.springframework.boot:spring-boot-starter' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-validation' + + runtimeOnly 'org.postgresql:postgresql' + implementation 'org.flywaydb:flyway-core' + + testImplementation 'com.h2database:h2:1.4.194' +} + +springBoot { + mainClassName 'com.bvn13.covid19.db.migration.Covid19DbMigratorApplication' +} diff --git a/covid19-db-migrator/gradlew b/covid19-db-migrator/gradlew new file mode 100755 index 0000000..536f027 --- /dev/null +++ b/covid19-db-migrator/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ]; do + ls=$(ls -ld "$PRG") + link=$(expr "$ls" : '.*-> \(.*\)$') + if expr "$link" : '/.*' >/dev/null; then + PRG="$link" + else + PRG=$(dirname "$PRG")"/$link" + fi +done +SAVED="$(pwd)" +cd "$(dirname \"$PRG\")/" >/dev/null +APP_HOME="$(pwd -P)" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=$(basename "$0") + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn() { + echo "$*" +} + +die() { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$(uname)" in +CYGWIN*) + cygwin=true + ;; +Darwin*) + darwin=true + ;; +MINGW*) + msys=true + ;; +NONSTOP*) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ]; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ]; then + MAX_FD_LIMIT=$(ulimit -H -n) + if [ $? -eq 0 ]; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ]; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ]; then + APP_HOME=$(cygpath --path --mixed "$APP_HOME") + CLASSPATH=$(cygpath --path --mixed "$CLASSPATH") + JAVACMD=$(cygpath --unix "$JAVACMD") + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=$(find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null) + SEP="" + for dir in $ROOTDIRSRAW; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ]; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@"; do + CHECK=$(echo "$arg" | egrep -c "$OURCYGPATTERN" -) + CHECK2=$(echo "$arg" | egrep -c "^-") ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ]; then ### Added a condition + eval $(echo args$i)=$(cygpath --path --ignore --mixed "$arg") + else + eval $(echo args$i)="\"$arg\"" + fi + i=$(expr $i + 1) + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save() { + for i; do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/"; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/covid19-db-migrator/gradlew.bat b/covid19-db-migrator/gradlew.bat new file mode 100644 index 0000000..62bd9b9 --- /dev/null +++ b/covid19-db-migrator/gradlew.bat @@ -0,0 +1,103 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/covid19-model/src/main/java/com/bvn13/covid19/model/Covid19ModelApplication.java b/covid19-db-migrator/src/main/java/com/bvn13/covid19/db/migration/Covid19DbMigratorApplication.java similarity index 82% rename from covid19-model/src/main/java/com/bvn13/covid19/model/Covid19ModelApplication.java rename to covid19-db-migrator/src/main/java/com/bvn13/covid19/db/migration/Covid19DbMigratorApplication.java index e506f85..4e28524 100644 --- a/covid19-model/src/main/java/com/bvn13/covid19/model/Covid19ModelApplication.java +++ b/covid19-db-migrator/src/main/java/com/bvn13/covid19/db/migration/Covid19DbMigratorApplication.java @@ -14,16 +14,16 @@ See the License for the specific language governing permissions and limitations under the License. */ -package com.bvn13.covid19.model; +package com.bvn13.covid19.db.migration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class Covid19ModelApplication { +public class Covid19DbMigratorApplication { public static void main(String[] args) { - SpringApplication.run(Covid19ModelApplication.class, args); + SpringApplication.run(Covid19DbMigratorApplication.class, args); } } diff --git a/covid19-db-migrator/src/main/resources/application.yaml b/covid19-db-migrator/src/main/resources/application.yaml new file mode 100644 index 0000000..02ff8fa --- /dev/null +++ b/covid19-db-migrator/src/main/resources/application.yaml @@ -0,0 +1,32 @@ + +spring: + application: + name: covid19-model + + flyway: + locations: classpath:db/migration + schemas: covid + + + datasource: + driver-class-name: org.postgresql.Driver + url: jdbc:postgresql://localhost:5432/covid19 + username: postgres + password: + + jpa: + show-sql: true + hibernate: + dialect: org.hibernate.dialect.PostgreSQL + ddl-auto: none + + properties: + hibernate: + default_schema: covid + use_sql_comments: true + format_sql: true + show_sql: true + jdbc: + lob: + non_contextual_creation: true + diff --git a/covid19-model/src/main/resources/db/migration/V000__init.sql b/covid19-db-migrator/src/main/resources/db/migration/V000__init.sql similarity index 80% rename from covid19-model/src/main/resources/db/migration/V000__init.sql rename to covid19-db-migrator/src/main/resources/db/migration/V000__init.sql index 1e5723d..23c741e 100644 --- a/covid19-model/src/main/resources/db/migration/V000__init.sql +++ b/covid19-db-migrator/src/main/resources/db/migration/V000__init.sql @@ -1,6 +1,6 @@ --create schema covid; -create sequence covid.cvd_regions_seq start 1 increment by 1; +create sequence covid.cvd_regions_seq start 1 increment by 1 no minvalue no maxvalue cache 1; create table covid.regions ( @@ -10,11 +10,11 @@ create table covid.regions constraint regions_name_uniq unique ); -alter sequence covid.cvd_regions_seq owned by covid.regions.id; -alter sequence covid.cvd_regions_seq owner to covid19; alter table covid.regions owner to covid19; +alter sequence covid.cvd_regions_seq owner to covid19; +alter sequence covid.cvd_regions_seq owned by covid.regions.id; -create sequence covid.cvd_updates_seq start 1 increment by 1; +create sequence covid.cvd_updates_seq start 1 increment by 1 no minvalue no maxvalue cache 1; create table covid.cvd_updates ( @@ -25,11 +25,11 @@ create table covid.cvd_updates datetime timestamp ); -alter sequence covid.cvd_updates_seq owned by covid.cvd_updates.id; -alter sequence covid.cvd_updates_seq owner to covid19; alter table covid.cvd_updates owner to covid19; +alter sequence covid.cvd_updates_seq owner to covid19; +alter sequence covid.cvd_updates_seq owned by covid.cvd_updates.id; -create sequence covid.cvd_stats_seq start 1 increment by 1; +create sequence covid.cvd_stats_seq start 1 increment by 1 no minvalue no maxvalue cache 1; create table if not exists covid.cvd_stats ( @@ -45,7 +45,7 @@ create table if not exists covid.cvd_stats constraint fk_cvd_stats_updates references covid.cvd_updates ); -alter sequence covid.cvd_stats_seq owned by covid.cvd_stats.id; +alter table covid.cvd_stats owner to covid19; alter sequence covid.cvd_stats_seq owner to covid19; -alter table covid_statistics owner to covid19; +alter sequence covid.cvd_stats_seq owned by covid.cvd_stats.id; diff --git a/covid19-db-migrator/src/main/resources/db/migration/V001__own_schema.sql b/covid19-db-migrator/src/main/resources/db/migration/V001__own_schema.sql new file mode 100644 index 0000000..8ce28de --- /dev/null +++ b/covid19-db-migrator/src/main/resources/db/migration/V001__own_schema.sql @@ -0,0 +1 @@ +alter schema covid owner to covid19; \ No newline at end of file diff --git a/covid19-model/src/main/resources/db/migration/V001__migrating_data.sql b/covid19-db-migrator/src/main/resources/db/migration/V002__migrating_data.sql similarity index 100% rename from covid19-model/src/main/resources/db/migration/V001__migrating_data.sql rename to covid19-db-migrator/src/main/resources/db/migration/V002__migrating_data.sql diff --git a/covid19-model/build.gradle b/covid19-model/build.gradle index b65fdc2..7bc334b 100644 --- a/covid19-model/build.gradle +++ b/covid19-model/build.gradle @@ -17,5 +17,5 @@ springBoot { mainClassName 'com.bvn13.covid19.model.Covid19ModelApplication' } -bootJar { enabled = true } +bootJar { enabled = false } jar { enabled = true } \ No newline at end of file diff --git a/covid19-model/src/main/resources/application.yaml b/covid19-model/src/main/resources/application.yaml index 02ff8fa..d6d153b 100644 --- a/covid19-model/src/main/resources/application.yaml +++ b/covid19-model/src/main/resources/application.yaml @@ -3,11 +3,6 @@ spring: application: name: covid19-model - flyway: - locations: classpath:db/migration - schemas: covid - - datasource: driver-class-name: org.postgresql.Driver url: jdbc:postgresql://localhost:5432/covid19 diff --git a/covid19-scheduler/src/main/resources/application.yaml b/covid19-scheduler/src/main/resources/application.yaml index dbdb5ab..56ea950 100644 --- a/covid19-scheduler/src/main/resources/application.yaml +++ b/covid19-scheduler/src/main/resources/application.yaml @@ -21,8 +21,7 @@ spring: name: covid19-scheduler flyway: - locations: classpath:db/migration - schemas: covid + enabled: false datasource: driver-class-name: org.postgresql.Driver diff --git a/settings.gradle b/settings.gradle index 33ff09d..24a2a30 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,5 +7,6 @@ rootProject.name = 'covid19' include ':covid19-model' +include ':covid19-db-migrator' include ':covid19-api' include ':covid19-scheduler' \ No newline at end of file