diff options
| author | Ken Collins <ken@metaskills.net> | 2017-01-26 23:47:53 -0500 |
|---|---|---|
| committer | Ken Collins <ken@metaskills.net> | 2017-01-27 08:13:55 -0500 |
| commit | 451320c850b4de68592a42be066c51e06fe19f44 (patch) | |
| tree | b4976dab2ce852b46badc6bdb8f350993b2857c9 | |
| parent | d506f3def1c56e40be0262a5d34560655faa9180 (diff) | |
| download | rails-451320c850b4de68592a42be066c51e06fe19f44.tar.gz rails-451320c850b4de68592a42be066c51e06fe19f44.tar.bz2 rails-451320c850b4de68592a42be066c51e06fe19f44.zip | |
Modernize SQL Server database YAML for Linux/vNext.
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml index c223d6bc62..a21555e573 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml @@ -1,4 +1,4 @@ -# SQL Server (2005 or higher recommended) +# SQL Server (2012 or higher recommended) # # Install the adapters and driver # gem install tiny_tds @@ -8,29 +8,12 @@ # gem 'tiny_tds' # gem 'activerecord-sqlserver-adapter' # -# You should make sure freetds is configured correctly first. -# freetds.conf contains host/port/protocol_versions settings. -# http://freetds.schemamania.org/userguide/freetdsconf.htm -# -# A typical Microsoft server -# [mssql] -# host = mssqlserver.yourdomain.com -# port = 1433 -# tds version = 7.1 - -# If you can connect with "tsql -S servername", your basic FreeTDS installation is working. -# 'man tsql' for more info -# Set timeout to a larger number if valid queries against a live db fail -# default: &default adapter: sqlserver encoding: utf8 - pool: <%%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> - reconnect: false - username: <%= app_name %> - password: - timeout: 25 - dataserver: from_freetds.conf + username: sa + password: <%= ENV['SA_PASSWORD'] %> + host: localhost development: <<: *default |