merging changes between branches #406
Merged
Conversation
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
Currently database settings reside in the config/database.yml this is redundant since Amber has settings per environment. This PR removes the `config/database.yml` and uses the environment yamls files to load the database settings. There is a couple of benefits for doing this: 1. Database settings are loaded per environment. 2. It is more intuitive to know where to put DB settings. [ENV LOADER] Add database settings to environment_loader - Adds database property to Amber::Settings - Adds database property to spec test.yml - Load database settings from environment yml - Updates settings specs to check for database settings - Updates environment loader specs to check for database settings [CLI] Updates init spec file - Updates amber spec file to check for database key - Tidy init_spec connection string validation - Add `expected_db_url(db_key, env)` method to cleanup specs
drujensen
changed the base branch from
ep/move-db-settings-to-environments
to
master
drujensen
changed the base branch from
master
to
ep/move-db-settings-to-environments
|
So happy! Just did some testing: Also: |
eliasjpr
approved these changes
Nov 23, 2017
|
@amberframework/core-team Can we get another approval? thx! |
Currently database settings reside in the config/database.yml this is redundant since Amber has settings per environment. This PR removes the `config/database.yml` and uses the environment yamls files to load the database settings. There is a couple of benefits for doing this: 1. Database settings are loaded per environment. 2. It is more intuitive to know where to put DB settings. [ENV LOADER] Add database settings to environment_loader - Adds database property to Amber::Settings - Adds database property to spec test.yml - Load database settings from environment yml - Updates settings specs to check for database settings - Updates environment loader specs to check for database settings [CLI] Updates init spec file - Updates amber spec file to check for database key - Tidy init_spec connection string validation - Add `expected_db_url(db_key, env)` method to cleanup specs
eliasjpr
force-pushed
the
ep/move-db-settings-to-environments
branch
from
f3f15bd to
2eb329d
Compare
eliasjpr
changed the base branch from
ep/move-db-settings-to-environments
to
master
eliasjpr
force-pushed
the
dj/merge-branches
branch
from
2e32c7e to
a86ea2d
Compare
faustinoaq
reviewed
Nov 23, 2017
|
|
||
| Then: | ||
|
|
||
| ```shellsession | ||
| shards update | ||
| amber migrate up | ||
| amber db drop create migrate |
There was a problem hiding this comment.
@drujensen Is this valid for sqlite too?
There was a problem hiding this comment.
Actually, it's incorrect for all db's. I will remove the drop.
If a model or migration is not created, all three should fail gracefully.
elorest
reviewed
Nov 23, 2017
| @@ -10,15 +10,16 @@ describe Amber::Server do | |||
| @log = ::Logger.new(STDOUT).tap{|l| l.level = ::Logger::INFO} | |||
| @color = true | |||
| @redis_url = "\#{ENV[%(REDIS_URL)]? || %(redis://localhost:6379)}" | |||
| @database_url = "mysql://root@localhost:3306/amber_test_app_test" | |||
There was a problem hiding this comment.
I seriously think that database_url should be in secrets since a database isn't required to run amber, or someone might want to have multiple database connections. Secrets is perfect for this since you could do database_url, logging_database_url, kelly_blue_book_database_url
|
@elorest It seems to me that |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of the Change
Merging branches between Elias and my PR's