rsim-activerecord-oracle_enhanced-adapter 1.2.0.1 → 1.2.0.2

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -346,8 +346,11 @@ module ActiveRecord
       # unescaped table name should start with letter and
       # contain letters, digits, _, $ or #
       # can be prefixed with schema name
+      # CamelCase table names should be quoted
       def self.valid_table_name?(name)
-        name.to_s =~ /^([A-Z_0-9]+\.)?[A-Z][A-Z_0-9\$#]*$/i ? true : false
+        name = name.to_s
+        name =~ /^([A-Za-z_0-9]+\.)?[a-z][a-z_0-9\$#]*$/ ||
+        name =~ /^([A-Za-z_0-9]+\.)?[A-Z][A-Z_0-9\$#]*$/ ? true : false
       end
 
       # abstract_adapter calls quote_column_name from quote_table_name, so prevent that
@@ -556,7 +559,7 @@ module ActiveRecord
 
       # RSI: changed select from user_tables to all_tables - much faster in large data dictionaries
       def tables(name = nil) #:nodoc:
-        select_all("select lower(table_name) name from all_tables where owner = sys_context('userenv','session_user')").map {|t| t['name']}
+        select_all("select decode(table_name,upper(table_name),lower(table_name),table_name) name from all_tables where owner = sys_context('userenv','session_user')").map {|t| t['name']}
       end
 
       def indexes(table_name, name = nil) #:nodoc:
@@ -822,12 +825,12 @@ module ActiveRecord
       end
 
       def structure_dump #:nodoc:
-        s = select_all("select sequence_name from user_sequences").inject("") do |structure, seq|
+        s = select_all("select sequence_name from user_sequences order by 1").inject("") do |structure, seq|
           structure << "create sequence #{seq.to_a.first.last};\n\n"
         end
 
         # RSI: changed select from user_tables to all_tables - much faster in large data dictionaries
-        select_all("select table_name from all_tables where owner = sys_context('userenv','session_user')").inject(s) do |structure, table|
+        select_all("select table_name from all_tables where owner = sys_context('userenv','session_user') order by 1").inject(s) do |structure, table|
           ddl = "create table #{table.to_a.first.last} (\n "
           cols = select_all(%Q{
             select column_name, data_type, data_length, char_used, char_length, data_precision, data_scale, data_default, nullable
@@ -855,12 +858,12 @@ module ActiveRecord
       end
 
       def structure_drop #:nodoc:
-        s = select_all("select sequence_name from user_sequences").inject("") do |drop, seq|
+        s = select_all("select sequence_name from user_sequences order by 1").inject("") do |drop, seq|
           drop << "drop sequence #{seq.to_a.first.last};\n\n"
         end
 
         # RSI: changed select from user_tables to all_tables - much faster in large data dictionaries
-        select_all("select table_name from all_tables where owner = sys_context('userenv','session_user')").inject(s) do |drop, table|
+        select_all("select table_name from all_tables where owner = sys_context('userenv','session_user') order by 1").inject(s) do |drop, table|
           drop << "drop table #{table.to_a.first.last} cascade constraints;\n\n"
         end
       end

data/lib/active_record/connection_adapters/oracle_enhanced_version.rb

@@ -1,11 +1,7 @@
 module ActiveRecord #:nodoc:
   module ConnectionAdapters #:nodoc:
     module OracleEnhancedVersion #:nodoc:
-      MAJOR = 1
-      MINOR = 2
-      TINY  = 0
-
-      STRING = [MAJOR, MINOR, TINY].join('.')
+      VERSION = '1.2.0'
     end
   end
 end

data/oracle-enhanced.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-oracle_enhanced-adapter}
-  s.version = "1.2.0.1"
+  s.version = "1.2.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Raimonds Simanovskis"]

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -47,6 +47,17 @@ describe "OracleEnhancedAdapter schema dump" do
     @new_conn = ActiveRecord::Base.oracle_enhanced_connection(CONNECTION_PARAMS)
     @new_conn.class.should == ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter
   end
+  
+  after(:all) do
+    # Workaround for undefining callback that was defined by JDBC adapter
+    if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+      ActiveRecord::Base.class_eval do
+        def after_save_with_oracle_lob
+          nil
+        end
+      end
+    end
+  end
 
   unless defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby" && RUBY_VERSION =~ /^1\.9/
     it "should return the same tables list as original oracle adapter" do
@@ -66,11 +77,11 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should return the same structure dump as original oracle adapter" do
-      @new_conn.structure_dump.should == @old_conn.structure_dump
+      @new_conn.structure_dump.split(";\n\n").sort.should == @old_conn.structure_dump.split(";\n\n").sort
     end
 
     it "should return the same structure drop as original oracle adapter" do
-      @new_conn.structure_drop.should == @old_conn.structure_drop
+      @new_conn.structure_drop.split(";\n\n").sort.should == @old_conn.structure_drop.split(";\n\n").sort
     end
   end
 
@@ -530,14 +541,26 @@ describe "OracleEnhancedAdapter table quoting" do
     end
   end
 
+  def create_camel_case_table
+    ActiveRecord::Schema.define do
+      suppress_messages do
+        create_table "CamelCase" do |t|
+          t.string      :name
+          t.integer     :foo
+        end
+      end
+    end
+  end
+
   after(:each) do
     ActiveRecord::Schema.define do
       suppress_messages do
-        drop_table "warehouse-things"
+        drop_table "warehouse-things" rescue nil
+        drop_table "CamelCase" rescue nil
       end
     end
-    Object.send(:remove_const, "WarehouseThing")
-    ActiveRecord::Base.table_name_prefix = nil
+    Object.send(:remove_const, "WarehouseThing") rescue nil
+    Object.send(:remove_const, "CamelCase") rescue nil
   end
 
   it "should allow creation of a table with non alphanumeric characters" do
@@ -548,6 +571,20 @@ describe "OracleEnhancedAdapter table quoting" do
 
     wh = WarehouseThing.create!(:name => "Foo", :foo => 2)
     wh.id.should_not be_nil
+
+    @conn.tables.should include("warehouse-things")
+  end
+
+  it "should allow creation of a table with CamelCase name" do
+    create_camel_case_table
+    class ::CamelCase < ActiveRecord::Base
+      set_table_name "CamelCase"
+    end
+
+    cc = CamelCase.create!(:name => "Foo", :foo => 2)
+    cc.id.should_not be_nil
+    
+    @conn.tables.should include("CamelCase")
   end
 
 end

data/spec/spec_helper.rb

@@ -58,28 +58,35 @@ module LoggerSpecHelper
   end
 end
 
+DATABASE_NAME = ENV['DATABASE_NAME'] || 'orcl'
+DATABASE_HOST = ENV['DATABASE_HOST'] || 'localhost'
+DATABASE_PORT = ENV['DATABASE_PORT'] || 1521
+DATABASE_USER = ENV['DATABASE_USER'] || 'hr'
+DATABASE_PASSWORD = ENV['DATABASE_PASSWORD'] || 'hr'
+DATABASE_SYS_PASSWORD = ENV['DATABASE_SYS_PASSWORD'] || 'admin'
+
 CONNECTION_PARAMS = {
   :adapter => "oracle_enhanced",
-  :database => "xe",
-  :host => "ubuntu810",
-  :username => "hr",
-  :password => "hr"
+  :database => DATABASE_NAME,
+  :host => DATABASE_HOST,
+  :username => DATABASE_USER,
+  :password => DATABASE_PASSWORD
 }
 
 JDBC_CONNECTION_PARAMS = {
   :adapter => "jdbc",
   :driver => "oracle.jdbc.driver.OracleDriver",
-  :url => "jdbc:oracle:thin:@ubuntu810:1521:XE",
-  :username => "hr",
-  :password => "hr"
+  :url => "jdbc:oracle:thin:@#{DATABASE_HOST}:#{DATABASE_PORT}:#{DATABASE_NAME}",
+  :username => DATABASE_USER,
+  :password => DATABASE_PASSWORD
 }
 
 SYS_CONNECTION_PARAMS = {
   :adapter => "oracle_enhanced",
-  :database => "xe",
-  :host => "ubuntu810",
+  :database => DATABASE_NAME,
+  :host => DATABASE_HOST,
   :username => "sys",
-  :password => "manager",
+  :password => DATABASE_SYS_PASSWORD,
   :privilege => "SYSDBA"
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rsim-activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version 
-  version: 1.2.0.1
+  version: 1.2.0.2
 platform: ruby
 authors: 
 - Raimonds Simanovskis