Skip to content

Commit 35c88e1

Browse files
committed
minor README updates
1 parent 5c25282 commit 35c88e1

File tree

1 file changed

+14
-20
lines changed

1 file changed

+14
-20
lines changed

README.md

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ JRubies) thus Java >= **1.6** is mandatory.
1313
#### AR-JDBC **1.3.x** is a recommended update for all **1.2.x** users.
1414

1515
Our latest major version **1.3.x** represents a few months of refactoring and
16-
updates covering (not just) new *ActiveRecord* features. It tries to stay compatible
17-
with 1.2.9 as much as possible but please be aware that it's not always possible
18-
(mostly for the best), please read our [migration guide][8] for details.
16+
updates covering (not just) new/old *ActiveRecord* features. It tries to stay
17+
compatible with 1.2.9 as much as possible but please be aware that it's not always
18+
possible(mostly for the best), please read our [migration guide][8] for details.
1919

2020
## Databases
2121

@@ -46,26 +46,26 @@ adapters are available:
4646
- HSQLDB (`activerecord-jdbchsqldb-adapter`)
4747
- H2 (`activerecord-jdbch2-adapter`)
4848
- MSSQL (`activerecord-jdbcmssql-adapter`) - uses the OSS jTDS driver by default
49-
which might have issues with the latest SQLServer (does not support SQL Azure)
49+
which might have issues with the latest SQLServer (but should work using the
50+
Microsoft JDBC Driver for SQL Server - we recommend using 4.0)
5051

51-
2a. For Rails 3, if you're generating a new application, use the
52-
following command to generate your application:
52+
2a. If you're generating a new Rails application, use the following command:
5353

5454
jruby -S rails new sweetapp
5555

5656
2b. Otherwise, you might need to perform some extra configuration steps
5757
to prepare your Rails application for JDBC.
5858

59-
If you're using Rails 3, you'll need to modify your *Gemfile* to use the
60-
*activerecord-jdbc-adapter* gem under JRuby. Change your *Gemfile* to look
61-
like the following (using MySQL as an example):
59+
You'll need to modify your *Gemfile* to use the *activerecord-jdbc-adapter* gem
60+
(or one of the helper gems) under JRuby. Change your *Gemfile* to look something
61+
like the following:
6262

6363
```ruby
6464
gem 'mysql2', platform: :ruby
6565
gem 'activerecord-jdbcmysql-adapter', platform: :jruby
6666
```
6767

68-
If you're (stuck) using Rails 2.3:
68+
If you're (stuck) using Rails 2.3, you might need to:
6969

7070
jruby script/generate jdbc
7171

@@ -96,7 +96,7 @@ development:
9696
```
9797

9898
For JNDI data sources, you may simply specify the JNDI location as follows (the
99-
correct adapter type will be automatically detected):
99+
correct database type will be automatically detected):
100100

101101
```yml
102102
production:
@@ -105,7 +105,7 @@ production:
105105
```
106106

107107
JDBC driver specific properties might be set if you use an URL to specify the DB
108-
or using the *properties:* syntax :
108+
or preferably using the *properties:* syntax:
109109

110110
```yml
111111
production:
@@ -133,14 +133,8 @@ development:
133133
username: business
134134
password: machines
135135
encoding: unicode
136-
```
137-
138-
If your SGBD isn't automatically discovered you can force a (DB2) dialect:
139-
140-
```yml
141-
development:
142-
# ... previous configuration
143-
dialect: as400 # for example
136+
# you can force a (DB2) dialect using:
137+
#dialect: as400
144138
```
145139

146140
More information on (configuring) AR-JDBC might be found on our [wiki][5].

0 commit comments

Comments
 (0)