updated demo example with Rails 3.0.0.beta4 and oracle_enhanced 1.3.0

rsim · Jun 21, 2010 · d0c6ea9 · d0c6ea9
1 parent 1a706a8
commit d0c6ea9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 69 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,15 +1,14 @@
 source 'http://rubygems.org'
 
-gem "rails", "3.0.0.beta2"
+gem "rails", "3.0.0.beta4"
 
 gem "ruby-oci8", ">=2.0.4"
-gem "activerecord-oracle_enhanced-adapter", ">=1.3.0.beta2", :git => 'git://github.com/rsim/oracle-enhanced.git', :branch => 'rails3',
+gem "activerecord-oracle_enhanced-adapter", ">=1.3.0", :require => 'active_record/connection_adapters/oracle_enhanced_adapter'
-  :require => 'active_record/connection_adapters/oracle_enhanced_adapter'
 
 # optionally also use ruby-plsql
 gem "ruby-plsql", ">=0.4.3"
 
 # group :test do
-#   gem "rspec", ">= 2.0.0.beta.2"
+#   gem "rspec", ">= 2.0.0.beta.12"
-#   gem "rspec-rails", ">= 2.0.0.beta.2"
+#   gem "rspec-rails", ">= 2.0.0.beta.12"
 # end
diff --git a/app/views/layouts/employees.html.erb b/app/views/layouts/employees.html.erb
@@ -3,7 +3,6 @@
 <head>
   <title>Employees: <%= controller.action_name %></title>
   <%= stylesheet_link_tag 'scaffold' %>
-  <%= javascript_include_tag :defaults %>
   <%= csrf_meta_tag %>
 </head>
 <body>

diff --git a/config/initializers/oracle.rb b/config/initializers/oracle.rb
@@ -1,6 +1,3 @@
-# monkey patches for Rails 3 beta that are needed for oracle_enhanced adapter
-require 'rails3_oracle_patches'
-
 # it's recommended to set time zone to ensure that Oracle session time zone
 # will be the same as Ruby Time.local time zone
 ENV['TZ'] = 'Europe/Riga'

diff --git a/lib/rails3_oracle_patches.rb b/lib/rails3_oracle_patches.rb