-
Notifications
You must be signed in to change notification settings - Fork 40.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Generalize script-based DB initialization and add R2DBC initializer
See gh-24741
- Loading branch information
1 parent
eb12004
commit 9cc7f0b
Showing
16 changed files
with
361 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 75 additions & 0 deletions
75
...src/main/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| /* | ||
| * Copyright 2012-2021 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. | ||
| */ | ||
|
|
||
| package org.springframework.boot.jdbc.init; | ||
|
|
||
| import java.nio.charset.Charset; | ||
| import java.util.List; | ||
|
|
||
| import javax.sql.DataSource; | ||
|
|
||
| import org.springframework.beans.factory.InitializingBean; | ||
| import org.springframework.boot.sql.init.AbstractScriptDatabaseInitializer; | ||
| import org.springframework.boot.sql.init.DatabaseInitializationSettings; | ||
| import org.springframework.core.io.Resource; | ||
| import org.springframework.jdbc.datasource.init.DatabasePopulatorUtils; | ||
| import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator; | ||
|
|
||
| /** | ||
| * {@link InitializingBean} that performs {@link DataSource} initialization using schema | ||
| * (DDL) and data (DML) scripts. | ||
| * | ||
| * @author Andy Wilkinson | ||
| * @since 2.5.0 | ||
| */ | ||
| public class DataSourceScriptDatabaseInitializer extends AbstractScriptDatabaseInitializer { | ||
|
|
||
| private final DataSource dataSource; | ||
|
|
||
| /** | ||
| * Creates a new {@link DataSourceScriptDatabaseInitializer} that will initialize the | ||
| * given {@code DataSource} using the given settings. | ||
| * @param dataSource data source to initialize | ||
| * @param settings initialization settings | ||
| */ | ||
| public DataSourceScriptDatabaseInitializer(DataSource dataSource, DatabaseInitializationSettings settings) { | ||
| super(settings); | ||
| this.dataSource = dataSource; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the {@code DataSource} that will be initialized. | ||
| * @return the initialization data source | ||
| */ | ||
| protected final DataSource getDataSource() { | ||
| return this.dataSource; | ||
| } | ||
|
|
||
| @Override | ||
| protected void runScripts(List<Resource> resources, boolean continueOnError, String separator, Charset encoding) { | ||
| ResourceDatabasePopulator populator = new ResourceDatabasePopulator(); | ||
| populator.setContinueOnError(continueOnError); | ||
| populator.setSeparator(separator); | ||
| if (encoding != null) { | ||
| populator.setSqlScriptEncoding(encoding.name()); | ||
| } | ||
| for (Resource resource : resources) { | ||
| populator.addScript(resource); | ||
| } | ||
| DatabasePopulatorUtils.execute(populator, this.dataSource); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
...oot/src/main/java/org/springframework/boot/r2dbc/init/R2dbcScriptDatabaseInitializer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * Copyright 2012-2021 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. | ||
| */ | ||
|
|
||
| package org.springframework.boot.r2dbc.init; | ||
|
|
||
| import java.nio.charset.Charset; | ||
| import java.util.List; | ||
|
|
||
| import io.r2dbc.spi.ConnectionFactory; | ||
|
|
||
| import org.springframework.beans.factory.InitializingBean; | ||
| import org.springframework.boot.sql.init.AbstractScriptDatabaseInitializer; | ||
| import org.springframework.boot.sql.init.DatabaseInitializationSettings; | ||
| import org.springframework.core.io.Resource; | ||
| import org.springframework.r2dbc.connection.init.ResourceDatabasePopulator; | ||
|
|
||
| /** | ||
| * An {@link InitializingBean} that initializes a database represented by an R2DBC | ||
| * {@link ConnectionFactory}. | ||
| * | ||
| * @author Andy Wilkinson | ||
| * @since 2.5.0 | ||
| */ | ||
| public class R2dbcScriptDatabaseInitializer extends AbstractScriptDatabaseInitializer { | ||
|
|
||
| private final ConnectionFactory connectionFactory; | ||
|
|
||
| /** | ||
| * Creates a new {@code R2dbcScriptDatabaseInitializer} that will initialize the | ||
| * database recognized by the given {@code connectionFactory} using the given | ||
| * {@code settings}. | ||
| * @param connectionFactory connectionFactory for the database | ||
| * @param settings initialization settings | ||
| */ | ||
| public R2dbcScriptDatabaseInitializer(ConnectionFactory connectionFactory, | ||
| DatabaseInitializationSettings settings) { | ||
| super(settings); | ||
| this.connectionFactory = connectionFactory; | ||
| } | ||
|
|
||
| @Override | ||
| protected void runScripts(List<Resource> scripts, boolean continueOnError, String separator, Charset encoding) { | ||
| ResourceDatabasePopulator populator = new ResourceDatabasePopulator(); | ||
| populator.setContinueOnError(continueOnError); | ||
| populator.setSeparator(separator); | ||
| if (encoding != null) { | ||
| populator.setSqlScriptEncoding(encoding.name()); | ||
| } | ||
| for (Resource script : scripts) { | ||
| populator.addScript(script); | ||
| } | ||
| populator.populate(this.connectionFactory).block(); | ||
| } | ||
|
|
||
| } |
21 changes: 21 additions & 0 deletions
21
...t-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/init/package-info.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| /* | ||
| * Copyright 2012-2021 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. | ||
| */ | ||
|
|
||
| /** | ||
| * Support for initializaton of an SQL database using an R2DBC | ||
| * {@link io.r2dbc.spi.ConnectionFactory ConnectionFactory}. | ||
| */ | ||
| package org.springframework.boot.r2dbc.init; |
Oops, something went wrong.