fix db entity names

This commit is contained in:
kochetkov 2024-11-21 10:50:01 +03:00
parent 135a3d8f36
commit e9360a5eab
5 changed files with 29 additions and 29 deletions

View file

@ -1,16 +1,16 @@
# App datasource # App datasource
DB_APP_NAME=ervu-eks DB_APP_NAME=ervu_eks
DB_APP_HOST=db DB_APP_HOST=db
DB_APP_PORT=5432 DB_APP_PORT=5432
DB_APP_USERNAME=ervu-eks DB_APP_USERNAME=ervu_eks
DB_APP_PASSWORD=ervu-eks DB_APP_PASSWORD=ervu_eks
# Security datasource # Security datasource
DB_SEC_NAME=ervu-eks DB_SEC_NAME=ervu_eks
DB_SEC_HOST=db DB_SEC_HOST=db
DB_SEC_PORT=5432 DB_SEC_PORT=5432
DB_SEC_USERNAME=ervu-eks-sec DB_SEC_USERNAME=ervu_eks_sec
DB_SEC_PASSWORD=ervu-eks-sec DB_SEC_PASSWORD=ervu_eks_sec
# Person datasource # Person datasource
DB_PERSON_NAME=person_registry DB_PERSON_NAME=person_registry

View file

@ -1,23 +1,23 @@
CREATE ROLE "ervu-eks" WITH CREATE ROLE "ervu_eks" WITH
LOGIN LOGIN
NOSUPERUSER NOSUPERUSER
INHERIT INHERIT
NOCREATEDB NOCREATEDB
NOCREATEROLE NOCREATEROLE
NOREPLICATION NOREPLICATION
PASSWORD 'ervu-eks'; PASSWORD 'ervu_eks';
CREATE ROLE "ervu-eks-sec" WITH CREATE ROLE "ervu_eks_sec" WITH
LOGIN LOGIN
NOSUPERUSER NOSUPERUSER
INHERIT INHERIT
NOCREATEDB NOCREATEDB
NOCREATEROLE NOCREATEROLE
NOREPLICATION NOREPLICATION
PASSWORD 'ervu-eks-sec'; PASSWORD 'ervu_eks_sec';
CREATE DATABASE "ervu-eks" CREATE DATABASE "ervu_eks"
WITH WITH
OWNER = "ervu-eks"; OWNER = "ervu_eks";
GRANT CREATE ON DATABASE "ervu-eks" TO "ervu-eks-sec"; GRANT CREATE ON DATABASE "ervu_eks" TO "ervu_eks_sec";

View file

@ -1,18 +1,18 @@
TZ=Europe/Moscow TZ=Europe/Moscow
# App datasource # App datasource
DB_APP_USERNAME=ervu-eks DB_APP_USERNAME=ervu_eks
DB_APP_PASSWORD=ervu-eks DB_APP_PASSWORD=ervu_eks
DB_APP_HOST=10.10.31.118 DB_APP_HOST=10.10.31.118
DB_APP_PORT=5432 DB_APP_PORT=5432
DB_APP_NAME=ervu-eks DB_APP_NAME=ervu_eks
# Security datasource # Security datasource
DB_SEC_USERNAME=ervu-eks-sec DB_SEC_USERNAME=ervu_eks_sec
DB_SEC_PASSWORD=ervu-eks-sec DB_SEC_PASSWORD=ervu_eks_sec
DB_SEC_HOST=10.10.31.118 DB_SEC_HOST=10.10.31.118
DB_SEC_PORT=5432 DB_SEC_PORT=5432
DB_SEC_NAME=ervu-eks DB_SEC_NAME=ervu_eks
# Person datasource # Person datasource
DB_PERSON_USERNAME=ervu DB_PERSON_USERNAME=ervu

View file

@ -156,11 +156,11 @@
<xa-datasource jndi-name="java:/webbpm/AppDS" pool-name="AppDS" enabled="true" use-java-context="true"> <xa-datasource jndi-name="java:/webbpm/AppDS" pool-name="AppDS" enabled="true" use-java-context="true">
<xa-datasource-property name="ServerName">10.10.31.118</xa-datasource-property> <xa-datasource-property name="ServerName">10.10.31.118</xa-datasource-property>
<xa-datasource-property name="PortNumber">5432</xa-datasource-property> <xa-datasource-property name="PortNumber">5432</xa-datasource-property>
<xa-datasource-property name="DatabaseName">ervu-eks</xa-datasource-property> <xa-datasource-property name="DatabaseName">ervu_eks</xa-datasource-property>
<driver>postgresql</driver> <driver>postgresql</driver>
<security> <security>
<user-name>ervu-eks</user-name> <user-name>ervu_eks</user-name>
<password>ervu-eks</password> <password>ervu_eks</password>
</security> </security>
<validation> <validation>
<valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker" /> <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker" />
@ -173,11 +173,11 @@
<xa-datasource jndi-name="java:/webbpm/security-ds" pool-name="SECURITYDS" enabled="true" use-java-context="true"> <xa-datasource jndi-name="java:/webbpm/security-ds" pool-name="SECURITYDS" enabled="true" use-java-context="true">
<xa-datasource-property name="ServerName">10.10.31.118</xa-datasource-property> <xa-datasource-property name="ServerName">10.10.31.118</xa-datasource-property>
<xa-datasource-property name="PortNumber">5432</xa-datasource-property> <xa-datasource-property name="PortNumber">5432</xa-datasource-property>
<xa-datasource-property name="DatabaseName">ervu-eks</xa-datasource-property> <xa-datasource-property name="DatabaseName">ervu_eks</xa-datasource-property>
<driver>postgresql</driver> <driver>postgresql</driver>
<security> <security>
<user-name>ervu-eks-sec</user-name> <user-name>ervu_eks_sec</user-name>
<password>ervu-eks-sec</password> <password>ervu_eks_sec</password>
</security> </security>
<validation> <validation>
<valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker" /> <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker" />

View file

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<datasource> <datasource>
<dbBeanPackage>ru.micord.ervu.eks.db_beans</dbBeanPackage> <dbBeanPackage>ru.micord.ervu.eks.db_beans</dbBeanPackage>
<dbName>ervu-eks</dbName> <dbName>ervu_eks</dbName>
<driverClassName>org.postgresql.Driver</driverClassName> <driverClassName>org.postgresql.Driver</driverClassName>
<host>10.10.31.118</host> <host>10.10.31.118</host>
<manually>false</manually> <manually>false</manually>
<password>ervu-eks</password> <password>ervu_eks</password>
<port>5432</port> <port>5432</port>
<replicaJndiNames>java:/webbpm/personRegistryDS</replicaJndiNames> <replicaJndiNames>java:/webbpm/personRegistryDS</replicaJndiNames>
<schemas>public</schemas> <schemas>public</schemas>
<sqlDialect>POSTGRES</sqlDialect> <sqlDialect>POSTGRES</sqlDialect>
<url>jdbc:postgresql://10.10.31.118:5432/ervu-eks</url> <url>jdbc:postgresql://10.10.31.118:5432/ervu_eks</url>
<urlPrefix>jdbc:postgresql:</urlPrefix> <urlPrefix>jdbc:postgresql:</urlPrefix>
<user>ervu-eks</user> <user>ervu_eks</user>
</datasource> </datasource>