oracle-enhanced-enhanced 0.0.1 → 0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oracle-enhanced-enhanced (0.0.1)
+    oracle-enhanced-enhanced (0.1.0)
       activerecord-oracle_enhanced-adapter
 
 GEM

data/lib/{active_directory/connection_adapters/oracle_enhanced_adapter.rb → oracle-enhanced-enhanced.rb}

@@ -2,9 +2,6 @@ module ActiveRecord
   module ConnectionAdapters
     class OracleEnhancedAdapter
 
-      # Set our new enhanced defaults
-      set_enhanced_defaults
-
       # Maximum length of an Oracle VARCHAR2 field
       VARCHAR2_MAX_LENGTH = 4000
 
@@ -14,7 +11,7 @@ module ActiveRecord
         NATIVE_DATABASE_TYPES[:text] = use_varchar2 ? {:name => 'VARCHAR2', :limit => length} : {:name => 'CLOB'}
       end
 
-      # Create convenience methods to check what storage representation is in effect
+      # Create convenience methods to check what text storage representation is in effect
       # e.g. text_is_clob?, text_is_varchar2?
       %w(clob varchar2).each do |format|
         (class << self; self; end).instance_eval do
@@ -24,44 +21,51 @@ module ActiveRecord
         end
       end
 
-      # Convert an existing CLOB field into a VARCHAR2. For use in migrations.
-      def convert_clob_to_varchar2(table_name, column_name, varchar2_length = VARCHAR2_MAX_LENGTH, temp_column_name = nil)
-        convert_text_column_storage_type table_name, column_name, "varchar2#{varchar2_length}", temp_column_name
-      end
-
-      # Convert an existing VARCHAR2 field into a CLOB. For use in migrations.
-      def convert_varchar2_to_clob(table_name, column_name, temp_column_name = nil)
-        convert_text_column_storage_type table_name, column_name, 'clob', temp_column_name
-      end
-
-      private
-
       # Enable our enhanced settings/defaults
-      def set_enhanced_defaults
+      def self.set_enhanced_defaults
         # Use varchar2(4000) for TEXT fields
         set_text_storage_representation true
 
         # Cache columns because we don't need to hit the database to check metadata all the time
+        #TODO: should we disable this for development?
         self.cache_columns = true
 
         # Oracle's default sequence behavious doesn't appeal to us OCD freaks who prefer monotonically increasing sequences
         self.default_sequence_start_value = "1 NOCACHE ORDER"
       end
 
+      # Enable the enhanced defaults
+      set_enhanced_defaults
+    end
+
+    module SchemaStatements
+      # Convert an existing CLOB field into a VARCHAR2. For use in migrations.
+      def convert_clob_to_varchar2(table_name, column_name, varchar2_length = ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter::VARCHAR2_MAX_LENGTH, temp_column_name = nil)
+        convert_text_column_storage_type table_name, column_name, "varchar2(#{varchar2_length})", temp_column_name
+      end
+
+      # Convert an existing VARCHAR2 field into a CLOB. For use in migrations.
+      def convert_varchar2_to_clob(table_name, column_name, temp_column_name = nil)
+        convert_text_column_storage_type table_name, column_name, 'clob', temp_column_name
+      end
+
+      private
+
       # Convert a field from varchar2 to clob or vice versa
       def convert_text_column_storage_type(table_name, column_name, to_type, temp_column_name)
-        # Inspired by http://asktom.oracle.com/pls/asktom/f?p=100:11:0::::P11_QUESTION_ID:1770086700346491686
-        temp_col = temp_column_name || 'oee_temp_col'
+        quoted_table_name = quote_table_name(table_name)
+        orig_col = quote_column_name(column_name)
+        temp_col = quote_column_name(temp_column_name || 'oee_temp_col')
         cmds = <<-SQL
-          alter table #{table_name} add #{temp_col} #{to_type}
-          update #{table_name} set #{temp_col} = #{column_name}
-          update #{table_name} set #{column_name} = null
-          alter table #{table_name} modify #{column_name} long
-          alter table #{table_name} modify #{column_name} #{to_type}
-          update #{table_name} set #{column_name} = #{temp_col}
-          alter table #{table_name} drop column #{temp_col}
+          alter table #{quoted_table_name} add #{temp_col} #{to_type}
+          update #{quoted_table_name} set #{temp_col} = #{orig_col}
+          alter table #{quoted_table_name} drop column #{orig_col}
+          alter table #{quoted_table_name} rename column #{temp_col} to #{orig_col}
         SQL
-        cmds.split('\n').each{|cmd| execute cmd}
+        cmds.split("\n").map(&:strip).each{|cmd| execute cmd}
+
+        # Also process any history table
+        convert_text_column_storage_type(history_table_name(table_name), column_name, to_type, temp_column_name) if history_table_exists?(table_name)
       end
     end
 

data/lib/oracle-enhanced-enhanced/version.rb

@@ -1,7 +1,7 @@
 module Oracle
   module Enhanced
     module Enhanced
-      VERSION = "0.0.1"
+      VERSION = "0.1.0"
     end
   end
 end

data/oracle-enhanced-enhanced.gemspec

@@ -9,8 +9,12 @@ Gem::Specification.new do |s|
   s.authors     = ["Steve Lamotte"]
   s.email       = ["slamotte@winnipeg.ca"]
   s.homepage    = "http://gems.winnipegtransit.org"
-  s.summary     = %q{Additional enhancements/customizations to the Oracle Enhanced adapter}
-  s.description = %q{This gem includes several enhancements and customizations to the standard Oracle Enhanced adapter, which is still required. Any customizations to this adapter's behaviour or additional Oracle-specific utilities should be added here.}
+  s.summary     = %q{Additional enhancements/customizations to the excellent ActiveRecord Oracle Enhanced adapter}
+  s.description = <<-END
+This gem includes several enhancements and customizations to the standard ActiveRecord Oracle Enhanced adapter, which is still required.
+
+Any customizations to this adapter's behaviour or additional Oracle-specific utilities should be added here.
+END
 
   s.rubyforge_project = "oracle-enhanced-enhanced"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oracle-enhanced-enhanced
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Steve Lamotte
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 -05:00
+date: 2011-05-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,11 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-description: This gem includes several enhancements and customizations to the standard Oracle Enhanced adapter, which is still required. Any customizations to this adapter's behaviour or additional Oracle-specific utilities should be added here.
+description: |
+  This gem includes several enhancements and customizations to the standard ActiveRecord Oracle Enhanced adapter, which is still required.
+  
+  Any customizations to this adapter's behaviour or additional Oracle-specific utilities should be added here.
+
 email: 
 - slamotte@winnipeg.ca
 executables: []
@@ -46,7 +50,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - Rakefile
-- lib/active_directory/connection_adapters/oracle_enhanced_adapter.rb
+- lib/oracle-enhanced-enhanced.rb
 - lib/oracle-enhanced-enhanced/version.rb
 - oracle-enhanced-enhanced.gemspec
 has_rdoc: true
@@ -82,6 +86,6 @@ rubyforge_project: oracle-enhanced-enhanced
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Additional enhancements/customizations to the Oracle Enhanced adapter
+summary: Additional enhancements/customizations to the excellent ActiveRecord Oracle Enhanced adapter
 test_files: []