#385

.travis.yml

@@ -26,7 +26,7 @@ after_success:
  - docker push mgramin/sql-boot
 
 before_deploy:
- - export TRAVIS_TAG=v0.4.0
+ - export TRAVIS_TAG=v0.5.0
  - git tag $TRAVIS_TAG --force
 
 deploy:
@@ -35,9 +35,9 @@ deploy:
  api_key: $GITHUB_TOKEN
  file:
  - target/sql-boot.zip
- - target/rpm/sql-boot/RPMS/noarch/sql-boot-0.4.0-1.noarch.rpm
+ - target/rpm/sql-boot/RPMS/noarch/sql-boot-0.5.0-1.noarch.rpm
  skip_cleanup: true
- name: v0.4.0
+ name: v0.5.0
  overwrite: true
  on:
  tags: false

pom.xml

@@ -30,7 +30,7 @@
 
  <groupId>com.github.mgramin.com.github.mgramin.sqlboot</groupId>
  <artifactId>sql-boot</artifactId>
- <version>0.4.0</version>
+ <version>0.5.0</version>
  <packaging>jar</packaging>
 
  <name>sql-boot</name>
@@ -528,7 +528,7 @@
  <groupname>sql-boot-group</groupname>
  <sources>
  <source>
- <location>target/sql-boot-0.4.0.jar</location>
+ <location>target/sql-boot-0.5.0.jar</location>
  <destination>sql-boot.jar</destination>
  </source>
  </sources>

src/main/assembly/assembly.xml

@@ -40,7 +40,7 @@
  <includeBaseDirectory>false</includeBaseDirectory>
  <files>
  <file>
- <source>target/sql-boot-0.4.0.jar</source>
+ <source>target/sql-boot-0.5.0.jar</source>
  <destName>sql-boot.jar</destName>
  <fileMode>0764</fileMode>
  </file>

src/main/kotlin/com/github/mgramin/sqlboot/model/connection/SimpleEndpoint.kt

@@ -66,10 +66,17 @@ open class SimpleEndpoint(
  dataSource!!
  } else {
  val dataSourceNew = DataSource()
+ if (properties().containsKey("jdbc.url")) {
+ dataSourceNew.url = properties()["jdbc.url"].toString()
+ } else {
+ val jdbcProtocol = properties()["jdbc.protocol"]
+ val dbName = properties()["db.name"]
+ val dbPort = properties()["db.port"]
+ dataSourceNew.url = "$jdbcProtocol:https://$host:$dbPort/$dbName"
+ }
  dataSourceNew.driverClassName = properties()["jdbc.driver.class.name"].toString()
- dataSourceNew.url = properties()["jdbc.url"].toString()
- dataSourceNew.username = properties()["jdbc.user"].toString()
- dataSourceNew.password = properties()["jdbc.password"].toString()
+ dataSourceNew.username = properties()["db.user"].toString()
+ dataSourceNew.password = properties()["db.password"].toString()
  dataSourceNew.minIdle = 1
  dataSourceNew.maxActive = 3
  dataSourceNew.maxIdle = 3