diff --git a/config/database.yml.mysql b/config/database.yml.mysql deleted file mode 100644 index 91e53e3..0000000 --- a/config/database.yml.mysql +++ /dev/null @@ -1,8 +0,0 @@ -development: - adapter: sqlserver - mode: dblib - dataserver: developer - database: land_info - username: sa - password: pickles - timeout: 5000 diff --git a/config/database.yml.sample b/config/database.yml.sample index 465d62d..0042e91 100644 --- a/config/database.yml.sample +++ b/config/database.yml.sample @@ -1,6 +1,14 @@ +<% if defined?(JRUBY_VERSION) %> development: adapter: jdbc - username: user - password: password + username: + password: driver: com.microsoft.sqlserver.jdbc.SQLServerDriver - url: jdbc:sqlserver://localhost:1433;databaseName=land_info + url: jdbc:sqlserver://gtisdev.pac.pwgsc.gc.ca:1433;databaseName=land_info +<% else %> +development: + adapter: mysql2 + database: land_info + username: + password: +<% end %>