activerecord-oracle_enhanced-adapter 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eef5dc051a873b8dc75975b556a46a45427f32b0
-  data.tar.gz: b81fefccb9c78bebadde53adc41a5a45746b2637
+  metadata.gz: 3140aab4b8a424d37dbf40c830b1078da12c520a
+  data.tar.gz: 5a4dda72b35ed5f9578ec10b21b2bf647ce3dd48
 SHA512:
-  metadata.gz: 94c87c4500eee69bd24870ebb1306866c85cb6351d38a44d18d1a67660ab022cd39bdcd3905ccd35b4567b6ec16bcb14efce849717a4284ac9117df9d1aa458f
-  data.tar.gz: 504cc8085f6ab6114b7bec94a4363ebdad91e557e601ef9ee9c5242bf674cc567674dea2bc604c0ced037066d6236776d42e69285aff7ece680e2f1e34af00ec
+  metadata.gz: 8b966b3ee7215ae2b724667d0eb929fdd2c2e5d7d8b98f7bfdcd66490e3a7fa7907dfbc1c3ec23fe42c358b7509a7035f67ad9b1d0815738f8d6cde248d72e34
+  data.tar.gz: 69feaef9c100e36ef781663aaaf98dafa72ee8f30d34b83611015da18311381bacec12c7ff97e846829076e4c9f9c411aeca1994478f3cb09bfd8fabb049889a

data/Gemfile

@@ -5,11 +5,11 @@ group :development do
   gem 'rspec', '~> 2.4'
   gem 'rdoc'
 
-  gem 'activerecord',   github: 'rails/rails'
-  gem 'activemodel',    github: 'rails/rails'
-  gem 'activesupport',  github: 'rails/rails'
-  gem 'actionpack',     github: 'rails/rails'
-  gem 'railties',       github: 'rails/rails'
+  gem 'activerecord',   github: 'rails/rails', branch: '4-2-stable'
+  gem 'activemodel',    github: 'rails/rails', branch: '4-2-stable'
+  gem 'activesupport',  github: 'rails/rails', branch: '4-2-stable'
+  gem 'actionpack',     github: 'rails/rails', branch: '4-2-stable'
+  gem 'railties',       github: 'rails/rails', branch: '4-2-stable'
 
   gem 'arel',           github: 'rails/arel', branch: '6-0-stable'
   gem 'journey',        github: 'rails/journey'

data/History.md

@@ -1,3 +1,19 @@
+## 1.6.4 / 2015-11-09
+
+* Changes and bug fixes since 1.6.2
+ * Add table and column comments to structure dump and schema dump [#734]
+ * Remove `serialized_attributes` which is removed in Rails 5 [#694]
+ * fixing bundler dependency conflict with head of rails vs arel 6.0[#714]
+ * Add note to readme about adapter name when using DATABASE_URL [#728]
+ * Fixed copy/paste error in README.md [#731]
+ * Pending a test using virtual columns features introduced in 11gR1 [#733]
+ * Suppress warning: ambiguous first argument [#690]
+ * Suppress `warning: assigned but unused variable` [#691]
+ * Suppress `warning: assigned but unused variable - tablespace` [#692]
+ * Suppress `warning: assigned but unused variable - e` [#693]
+ * Ignore .rbenv-gemsets [#705]
+ * Clean up database objects after unit tests executed [#712]
+
 ## 1.6.3 / 2015-08-14
 
 * Changes and bug fixes since 1.6.2

data/README.md

@@ -19,7 +19,7 @@ When using Ruby on Rails version 4.2 then in Gemfile include
 gem 'activerecord-oracle_enhanced-adapter', '~> 1.6.0'
 ```
 
-where instead of 1.6.0 you can specify any other desired version. It is recommended to specify version with `~>` which means that use specified version or later patch versions (in this example any later 1.5.x version but not 1.6.x version). Oracle enhanced adapter maintains API backwards compatibility during patch version upgrades and therefore it is safe to always upgrade to latest patch version.
+where instead of 1.6.0 you can specify any other desired version. It is recommended to specify version with `~>` which means that use specified version or later patch versions (in this example any later 1.6.x version but not 1.7.x version). Oracle enhanced adapter maintains API backwards compatibility during patch version upgrades and therefore it is safe to always upgrade to latest patch version.
 
 ### Rails 4.0 and 4.1
 
@@ -178,6 +178,14 @@ development:
   password: secret
 ```
 
+
+If you choose to specify your database connection via the `DATABASE_URL`
+environment variable, note that the adapter name uses a dash instead of an underscore:
+
+```bash
+DATABASE_URL=oracle-enhanced://localhost/XE
+```
+
 If you deploy JRuby on Rails application in Java application server that supports JNDI connections then you can specify JNDI connection as well:
 
 ```yml

data/VERSION

@@ -1 +1 @@
-1.6.3
+1.6.4

data/activerecord-oracle_enhanced-adapter.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-oracle_enhanced-adapter}
-  s.version = "1.6.3"
+  s.version = "1.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.license = 'MIT'
   s.authors = [%q{Raimonds Simanovskis}]
-  s.date = %q{2015-08-14}
+  s.date = %q{2015-11-09}
   s.description = %q{Oracle "enhanced" ActiveRecord adapter contains useful additional methods for working with new and legacy Oracle databases.
 This adapter is superset of original ActiveRecord Oracle adapter.
 }

data/lib/active_record/connection_adapters/oracle_enhanced/column_dumper.rb

@@ -48,6 +48,7 @@ module ActiveRecord #:nodoc:
           spec[:null]      = 'false' if !column.null
           spec[:as]        = column.virtual_column_data_default if column.virtual?
           spec[:default]   = schema_default(column) if column.has_default? && !column.virtual?
+          spec[:comment]   = column.comment.inspect unless column.comment.nil?
           spec.delete(:default) if spec[:default].nil?
           spec
         end
@@ -57,7 +58,7 @@ module ActiveRecord #:nodoc:
           # return original method if not using 'OracleEnhanced'
           return migration_keys_without_oracle_enhanced unless oracle_enhanced_adapter?
 
-          [:name, :limit, :precision, :scale, :default, :null, :as, :virtual_type]
+          [:name, :limit, :precision, :scale, :default, :null, :as, :virtual_type, :comment]
         end
       end
     end

data/lib/active_record/connection_adapters/oracle_enhanced/database_statements.rb

@@ -229,7 +229,7 @@ module ActiveRecord
         # Returns default sequence name for table.
         # Will take all or first 26 characters of table name and append _seq suffix
         def default_sequence_name(table_name, primary_key = nil)
-          table_name.to_s.gsub /(^|\.)([\w$-]{1,#{sequence_name_length-4}})([\w$-]*)$/, '\1\2_seq'
+          table_name.to_s.gsub (/(^|\.)([\w$-]{1,#{sequence_name_length-4}})([\w$-]*)$/), '\1\2_seq'
         end
 
         # Inserts the given fixture into the table. Overridden to properly handle lobs.

data/lib/active_record/connection_adapters/oracle_enhanced/procedures.rb

@@ -152,7 +152,7 @@ module ActiveRecord #:nodoc:
           if partial_writes?
             # Serialized attributes should always be written in case they've been
             # changed in place.
-            update_using_custom_method(changed | (attributes.keys & self.class.serialized_attributes.keys))
+            update_using_custom_method(changed | (attributes.keys & self.class.columns.select {|column| column.cast_type.is_a?(Type::Serialized)}))
           else
             update_using_custom_method(attribute_names)
           end

data/lib/active_record/connection_adapters/oracle_enhanced/schema_dumper.rb

@@ -50,7 +50,7 @@ module ActiveRecord #:nodoc:
 
       def primary_key_trigger(table_name, stream)
         if @connection.respond_to?(:has_primary_key_trigger?) && @connection.has_primary_key_trigger?(table_name)
-          pk, pk_seq = @connection.pk_and_sequence_for(table_name)
+          pk, _pk_seq = @connection.pk_and_sequence_for(table_name)
           stream.print "  add_primary_key_trigger #{table_name.inspect}"
           stream.print ", primary_key: \"#{pk}\"" if pk != 'id'
           stream.print "\n\n"
@@ -121,16 +121,21 @@ module ActiveRecord #:nodoc:
 
           # first dump primary key column
           if @connection.respond_to?(:pk_and_sequence_for)
-            pk, pk_seq = @connection.pk_and_sequence_for(table)
+            pk, _pk_seq = @connection.pk_and_sequence_for(table)
           elsif @connection.respond_to?(:primary_key)
             pk = @connection.primary_key(table)
           end
-          
+
           tbl.print "  create_table #{table.inspect}"
-          
+
           # addition to make temporary option work
           tbl.print ", temporary: true" if @connection.temporary_table?(table)
-          
+
+          table_comments = @connection.table_comment(table)
+          unless table_comments.nil?
+            tbl.print ", comment: #{table_comments.inspect}"
+          end
+
           if columns.detect { |c| c.name == pk }
             if pk != 'id'
               tbl.print %Q(, primary_key: "#{pk}")

data/lib/active_record/connection_adapters/oracle_enhanced/schema_statements.rb

@@ -74,7 +74,6 @@ module ActiveRecord
           yield td if block_given?
           create_sequence = create_sequence || td.create_sequence
           column_comments = td.column_comments if td.column_comments
-          tablespace = tablespace_for(:table, options[:tablespace])
 
           if options[:force] && table_exists?(table_name)
             drop_table(table_name, options)

data/lib/active_record/connection_adapters/oracle_enhanced/structure_dump.rb

@@ -34,6 +34,8 @@ module ActiveRecord #:nodoc:
           structure << ddl
           structure << structure_dump_indexes(table_name)
           structure << structure_dump_unique_keys(table_name)
+          structure << structure_dump_table_comments(table_name)
+          structure << structure_dump_column_comments(table_name)
         end
 
         join_with_statement_token(structure) << structure_dump_fk_constraints
@@ -134,6 +136,31 @@ module ActiveRecord #:nodoc:
         join_with_statement_token(fks)
       end
 
+      def structure_dump_table_comments(table_name)
+        comments = []
+        comment = table_comment(table_name)
+
+        unless comment.nil?
+          comments << "COMMENT ON TABLE #{quote_table_name(table_name)} IS '#{quote_string(comment)}'"
+        end
+
+        join_with_statement_token(comments)
+      end
+
+      def structure_dump_column_comments(table_name)
+        comments = []
+        columns = select_values("SELECT column_name FROM user_tab_columns WHERE table_name = '#{table_name}' ORDER BY column_id")
+
+        columns.each do |column|
+          comment = column_comment(table_name, column)
+          unless comment.nil?
+            comments << "COMMENT ON COLUMN #{quote_table_name(table_name)}.#{quote_column_name(column)} IS '#{quote_string(comment)}'"
+          end
+        end
+
+        join_with_statement_token(comments)
+      end
+
       def foreign_key_definition(to_table, options = {}) #:nodoc:
         columns = Array(options[:column] || options[:columns])
 
@@ -280,7 +307,7 @@ module ActiveRecord #:nodoc:
                AND table_name = '#{table.upcase}'
           SQL
         # feature not supported previous to 11g
-        rescue ActiveRecord::StatementInvalid => e
+        rescue ActiveRecord::StatementInvalid => _e
           []
         end
       end

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -862,7 +862,7 @@ module ActiveRecord
 
       # Will return true if database object exists (to be able to use also views and synonyms for ActiveRecord models)
       def table_exists?(table_name)
-        (owner, table_name, db_link) = @connection.describe(table_name)
+        (_owner, table_name, _db_link) = @connection.describe(table_name)
         true
       rescue
         false

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -474,4 +474,44 @@ describe "OracleEnhancedAdapter schema dump" do
       standard_dump.should =~ /t\.float "hourly_rate"$/
     end
   end
+
+  describe "table comments" do
+    before(:each) do
+      schema_define do
+        create_table :test_table_comments, :comment => "this is a \"table comment\"!", force: true do |t|
+          t.string :blah
+        end
+      end
+    end
+
+    after(:each) do
+      schema_define do
+        drop_table :test_table_comments
+      end
+    end
+
+    it "should dump table comments" do
+      standard_dump.should =~ /comment: "this is a \\"table comment\\"!"/
+    end
+  end
+
+  describe "column comments" do
+    before(:each) do
+      schema_define do
+        create_table :test_column_comments, force: true do |t|
+          t.string :blah, :comment => "this is a \"column comment\"!"
+        end
+      end
+    end
+
+    after(:each) do
+      schema_define do
+        drop_table :test_column_comments
+      end
+    end
+
+    it "should dump column comments" do
+      standard_dump.should =~ /comment: "this is a \\"column comment\\"!"/
+    end
+  end
 end

data/spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb

@@ -423,6 +423,7 @@ describe "OracleEnhancedAdapter schema definition" do
         drop_table :new_test_employees rescue nil
         drop_table :test_employees_no_pkey rescue nil
         drop_table :new_test_employees_no_pkey rescue nil
+        drop_table :aaaaaaaaaaaaaaaaaaaaaaaaaaa rescue nil
       end
     end
 

data/spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb

@@ -163,6 +163,7 @@ describe "OracleEnhancedAdapter structure dump" do
     end
 
     it "should dump RAW virtual columns" do
+      pending "Not supported in this database version" unless @oracle11g_or_higher
       @conn.execute <<-SQL
         CREATE TABLE bars (
           id          NUMBER(38,0) NOT NULL,
@@ -225,6 +226,20 @@ describe "OracleEnhancedAdapter structure dump" do
       dump.should =~ /CREATE TABLE \"BARS\" \(\n\"ID\" NUMBER\(38,0\) NOT NULL,\n \"SUPER\" RAW\(255\)/
     end
 
+    it "should dump table comments" do
+      comment_sql = %Q(COMMENT ON TABLE "TEST_POSTS" IS 'Test posts with ''some'' "quotes"')
+      @conn.execute comment_sql
+      dump = ActiveRecord::Base.connection.structure_dump
+      dump.should =~ /#{comment_sql}/
+    end
+
+    it "should dump column comments" do
+      comment_sql = %Q(COMMENT ON COLUMN "TEST_POSTS"."TITLE" IS 'The title of the post with ''some'' "quotes"')
+      @conn.execute comment_sql
+      dump = ActiveRecord::Base.connection.structure_dump
+      dump.should =~ /#{comment_sql}/
+    end
+
   end
   describe "temporary tables" do
     after(:all) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler