Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d34f0d16cc | ||
| 476db28821 | |||
|
|
18c347b6ad | ||
| 4aa8709eb5 | |||
|
|
3766241dad | ||
| 009b2b1ad9 |
15
CHANGELOG.md
15
CHANGELOG.md
@@ -363,3 +363,18 @@
|
|||||||
### Features
|
### Features
|
||||||
|
|
||||||
* Update Hibernate connection provider and database configuration ([71a549b](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/71a549b7f059e748f7691bb9a27e2861b61c6f6f))
|
* Update Hibernate connection provider and database configuration ([71a549b](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/71a549b7f059e748f7691bb9a27e2861b61c6f6f))
|
||||||
|
## (2026-01-20)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* Add HikariCP specific configuration to db.conf ([009b2b1](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/009b2b1ad9180f58a0b1434354f8a467b4e452ca))
|
||||||
|
## (2026-01-20)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* Add HikariCP specific configuration to db.conf ([4aa8709](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/4aa8709eb593b03254efc616b6b04c23b23ab6ab))
|
||||||
|
## (2026-01-20)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* Enhance EntityManagerProvider to use Play configuration for database settings ([476db28](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/476db288216ed2c1013fe3ddb9b82472254e352b))
|
||||||
|
|||||||
@@ -2,13 +2,25 @@ package di
|
|||||||
|
|
||||||
import com.google.inject.Provider
|
import com.google.inject.Provider
|
||||||
import com.google.inject.Inject
|
import com.google.inject.Inject
|
||||||
|
import play.api.Configuration
|
||||||
import jakarta.inject.Singleton
|
import jakarta.inject.Singleton
|
||||||
import jakarta.persistence.{EntityManager, EntityManagerFactory, Persistence}
|
import jakarta.persistence.{EntityManager, EntityManagerFactory, Persistence}
|
||||||
|
|
||||||
@Singleton
|
@Singleton
|
||||||
class EntityManagerProvider @Inject()() extends Provider[EntityManager] {
|
class EntityManagerProvider @Inject()(config: Configuration) extends Provider[EntityManager] {
|
||||||
|
|
||||||
private val emf: EntityManagerFactory = Persistence.createEntityManagerFactory("defaultPersistenceUnit")
|
private val emf: EntityManagerFactory = {
|
||||||
|
val dbConfig = config.get[Configuration]("db.default")
|
||||||
|
val props = new java.util.HashMap[String, Object]()
|
||||||
|
|
||||||
|
// Map Play configuration to Jakarta Persistence properties
|
||||||
|
props.put("jakarta.persistence.jdbc.driver", dbConfig.get[String]("driver"))
|
||||||
|
props.put("jakarta.persistence.jdbc.url", dbConfig.get[String]("url"))
|
||||||
|
props.put("jakarta.persistence.jdbc.user", dbConfig.get[String]("username"))
|
||||||
|
props.put("jakarta.persistence.jdbc.password", dbConfig.get[String]("password"))
|
||||||
|
|
||||||
|
Persistence.createEntityManagerFactory("defaultPersistenceUnit", props)
|
||||||
|
}
|
||||||
|
|
||||||
override def get(): EntityManager = {
|
override def get(): EntityManager = {
|
||||||
emf.createEntityManager()
|
emf.createEntityManager()
|
||||||
|
|||||||
@@ -9,11 +9,11 @@
|
|||||||
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
|
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Database connection settings -->
|
<!-- Database connection settings (Overridden by EntityManagerProvider) -->
|
||||||
<property name="jakarta.persistence.jdbc.driver" value="org.postgresql.Driver"/>
|
<property name="jakarta.persistence.jdbc.driver" value="org.postgresql.Driver"/>
|
||||||
<property name="jakarta.persistence.jdbc.url" value="${DATABASE_URL}"/>
|
<property name="jakarta.persistence.jdbc.url" value="jdbc:postgresql://localhost:5432/knockoutwhist"/>
|
||||||
<property name="jakarta.persistence.jdbc.user" value="${DB_USER}"/>
|
<property name="jakarta.persistence.jdbc.user" value="kw_user"/>
|
||||||
<property name="jakarta.persistence.jdbc.password" value="${DB_PASSWORD}"/>
|
<property name="jakarta.persistence.jdbc.password" value="postgres"/>
|
||||||
|
|
||||||
<!-- Hibernate specific settings -->
|
<!-- Hibernate specific settings -->
|
||||||
<property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
|
<property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
|
||||||
|
|||||||
@@ -1,10 +1,22 @@
|
|||||||
|
|
||||||
# Database configuration - PostgreSQL with environment variables
|
# Database configuration - PostgreSQL with environment variables
|
||||||
db.default.driver=org.postgresql.Driver
|
db.default.driver="org.postgresql.Driver"
|
||||||
db.default.jdbcUrl=${?DATABASE_URL}
|
db.default.url="jdbc:postgresql://localhost:5432/knockoutwhist"
|
||||||
|
db.default.url=${?DATABASE_URL}
|
||||||
|
db.default.username="kw_user"
|
||||||
db.default.username=${?DB_USER}
|
db.default.username=${?DB_USER}
|
||||||
|
db.default.password="postgres"
|
||||||
db.default.password=${?DB_PASSWORD}
|
db.default.password=${?DB_PASSWORD}
|
||||||
|
|
||||||
|
# HikariCP specific configuration
|
||||||
|
db.default.hikaricp.driverClassName="org.postgresql.Driver"
|
||||||
|
db.default.hikaricp.jdbcUrl="jdbc:postgresql://localhost:5432/knockoutwhist"
|
||||||
|
db.default.hikaricp.jdbcUrl=${?DATABASE_URL}
|
||||||
|
db.default.hikaricp.username="kw_user"
|
||||||
|
db.default.hikaricp.username=${?DB_USER}
|
||||||
|
db.default.hikaricp.password="postgres"
|
||||||
|
db.default.hikaricp.password=${?DB_PASSWORD}
|
||||||
|
|
||||||
# JPA/Hibernate configuration
|
# JPA/Hibernate configuration
|
||||||
jpa.default=defaultPersistenceUnit
|
jpa.default=defaultPersistenceUnit
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
MAJOR=4
|
MAJOR=4
|
||||||
MINOR=34
|
MINOR=37
|
||||||
PATCH=0
|
PATCH=0
|
||||||
|
|||||||
Reference in New Issue
Block a user