Skip to content

Commit d445d37

Browse files
committed
Rename "databases" module to "database_connections"
1 parent 8618adf commit d445d37

14 files changed

Lines changed: 16 additions & 17 deletions

File tree

crates/stackable-operator/src/databases/databases/derby.rs renamed to crates/stackable-operator/src/database_connections/databases/derby.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
55
use snafu::{OptionExt, ResultExt, Snafu};
66

77
use crate::{
8-
databases::{
8+
database_connections::{
99
TemplatingMechanism,
1010
drivers::jdbc::{JdbcDatabaseConnection, JdbcDatabaseConnectionDetails},
1111
},
@@ -43,7 +43,7 @@ impl JdbcDatabaseConnection for DerbyConnection {
4343
&self,
4444
unique_database_name: &str,
4545
_templating_mechanism: &TemplatingMechanism,
46-
) -> Result<JdbcDatabaseConnectionDetails, crate::databases::Error> {
46+
) -> Result<JdbcDatabaseConnectionDetails, crate::database_connections::Error> {
4747
let location = self.location.as_ref_or_else(|| {
4848
PathBuf::from(format!("/tmp/derby/{unique_database_name}/derby.db"))
4949
});

crates/stackable-operator/src/databases/databases/mod.rs renamed to crates/stackable-operator/src/database_connections/databases/mod.rs

File renamed without changes.

crates/stackable-operator/src/databases/databases/mysql.rs renamed to crates/stackable-operator/src/database_connections/databases/mysql.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use snafu::{ResultExt, Snafu};
66

77
use crate::{
88
commons::networking::HostName,
9-
databases::{
9+
database_connections::{
1010
TemplatingMechanism,
1111
drivers::jdbc::{JdbcDatabaseConnection, JdbcDatabaseConnectionDetails},
1212
helpers::{connection_parameters_as_url_query_parameters, username_and_password_envs},
@@ -55,7 +55,7 @@ impl JdbcDatabaseConnection for MysqlConnection {
5555
&self,
5656
unique_database_name: &str,
5757
_templating_mechanism: &TemplatingMechanism,
58-
) -> Result<JdbcDatabaseConnectionDetails, crate::databases::Error> {
58+
) -> Result<JdbcDatabaseConnectionDetails, crate::database_connections::Error> {
5959
let Self {
6060
host,
6161
port,

crates/stackable-operator/src/databases/databases/postgresql.rs renamed to crates/stackable-operator/src/database_connections/databases/postgresql.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use snafu::{ResultExt, Snafu};
66

77
use crate::{
88
commons::networking::HostName,
9-
databases::{
9+
database_connections::{
1010
TemplatingMechanism,
1111
drivers::{
1212
celery::{CeleryDatabaseConnection, CeleryDatabaseConnectionDetails},
@@ -61,7 +61,7 @@ impl JdbcDatabaseConnection for PostgresqlConnection {
6161
&self,
6262
unique_database_name: &str,
6363
_templating_mechanism: &TemplatingMechanism,
64-
) -> Result<JdbcDatabaseConnectionDetails, crate::databases::Error> {
64+
) -> Result<JdbcDatabaseConnectionDetails, crate::database_connections::Error> {
6565
let Self {
6666
host,
6767
port,

crates/stackable-operator/src/databases/databases/redis.rs renamed to crates/stackable-operator/src/database_connections/databases/redis.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
33

44
use crate::{
55
commons::networking::HostName,
6-
databases::{
6+
database_connections::{
77
TemplatingMechanism,
88
drivers::celery::{CeleryDatabaseConnection, CeleryDatabaseConnectionDetails},
99
helpers::username_and_password_envs,

crates/stackable-operator/src/databases/drivers/celery.rs renamed to crates/stackable-operator/src/database_connections/drivers/celery.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
44

55
use crate::{
66
builder::pod::{container::ContainerBuilder, env::env_var_from_secret},
7-
databases::TemplatingMechanism,
7+
database_connections::TemplatingMechanism,
88
};
99

1010
/// Implemented by database connection types that can serve as a

crates/stackable-operator/src/databases/drivers/jdbc.rs renamed to crates/stackable-operator/src/database_connections/drivers/jdbc.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use url::Url;
55

66
use crate::{
77
builder::pod::container::ContainerBuilder,
8-
databases::{TemplatingMechanism, helpers::username_and_password_envs},
8+
database_connections::{TemplatingMechanism, helpers::username_and_password_envs},
99
};
1010

1111
/// Implemented by database connection types that support JDBC.
@@ -22,7 +22,7 @@ pub trait JdbcDatabaseConnection {
2222
fn jdbc_connection_details(
2323
&self,
2424
unique_database_name: &str,
25-
) -> Result<JdbcDatabaseConnectionDetails, crate::databases::Error> {
25+
) -> Result<JdbcDatabaseConnectionDetails, crate::database_connections::Error> {
2626
self.jdbc_connection_details_with_templating(
2727
unique_database_name,
2828
&TemplatingMechanism::default(),
@@ -36,7 +36,7 @@ pub trait JdbcDatabaseConnection {
3636
&self,
3737
unique_database_name: &str,
3838
templating_mechanism: &TemplatingMechanism,
39-
) -> Result<JdbcDatabaseConnectionDetails, crate::databases::Error>;
39+
) -> Result<JdbcDatabaseConnectionDetails, crate::database_connections::Error>;
4040
}
4141

4242
pub struct JdbcDatabaseConnectionDetails {
@@ -93,7 +93,7 @@ impl JdbcDatabaseConnection for GenericJdbcDatabaseConnection {
9393
&self,
9494
unique_database_name: &str,
9595
_templating_mechanism: &TemplatingMechanism,
96-
) -> Result<JdbcDatabaseConnectionDetails, crate::databases::Error> {
96+
) -> Result<JdbcDatabaseConnectionDetails, crate::database_connections::Error> {
9797
let (username_env, password_env) =
9898
username_and_password_envs(unique_database_name, &self.credentials_secret);
9999

crates/stackable-operator/src/databases/drivers/mod.rs renamed to crates/stackable-operator/src/database_connections/drivers/mod.rs

File renamed without changes.

crates/stackable-operator/src/databases/drivers/sqlalchemy.rs renamed to crates/stackable-operator/src/database_connections/drivers/sqlalchemy.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
44

55
use crate::{
66
builder::pod::{container::ContainerBuilder, env::env_var_from_secret},
7-
databases::TemplatingMechanism,
7+
database_connections::TemplatingMechanism,
88
};
99

1010
/// Implemented by database connection types that support

crates/stackable-operator/src/databases/helpers.rs renamed to crates/stackable-operator/src/database_connections/helpers.rs

File renamed without changes.

0 commit comments

Comments
 (0)