legacy_data 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/generators/models_from_tables/models_from_tables_generator.rb

@@ -23,8 +23,9 @@ class ModelsFromTablesGenerator < Rails::Generator::Base
                              :assigns => analyzed_table.to_hash
       end
     end
-#   rescue => e
-#     puts e.backtrace
+  rescue => e
+    # for debugging...
+    puts e.backtrace
   end
 
 protected

data/legacy_data.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{legacy_data}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Rothenberg"]
-  s.date = %q{2009-10-08}
+  s.date = %q{2009-10-12}
   s.description = %q{Create ActiveRecord models from an existing database}
   s.email = %q{alex@alexrothenberg.com}
   s.extra_rdoc_files = [

data/lib/legacy_data/schema.rb

@@ -83,10 +83,11 @@ module LegacyData
 
     def primary_key
       if connection.respond_to?(:pk_and_sequence_for)
-        pk = connection.pk_and_sequence_for(table_name).first
+        pk, seq = connection.pk_and_sequence_for(table_name)
       elsif connection.respond_to?(:primary_key)
         pk = connection.primary_key(table_name)
       end
+      pk
     end
 
     def relations

data/lib/legacy_data.rb

@@ -1,4 +1,12 @@
 require 'legacy_data/table_definition'
 require 'legacy_data/schema'
 require 'legacy_data/table_class_name_mapper'
-require 'active_record/connection_adapters/oracle_enhanced_adapter'
+
+
+module ActiveRecord  
+  Base.class_eval do
+    if ['OracleEnhanced'].include? connection.adapter_name
+      require "#{File.dirname(__FILE__)}/active_record/connection_adapters/#{connection.adapter_name.underscore}_adapter"
+    end
+  end
+end

data/spec/functional/functional_spec_helper.rb

@@ -1,13 +1,3 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-ActiveRecord::Base.establish_connection({:adapter=>'sqlite3', :database=> ":memory:"})
-
-ActiveRecord::Base.connection.create_table :posts do |t|
-  t.string :title
-  t.text   :body
-end
-ActiveRecord::Base.connection.create_table :comments do |t|
-  t.integer :post_id
-  t.text    :body
-end
 

data/spec/spec_helper.rb

@@ -1,6 +1,19 @@
 require 'rubygems'
 require 'activerecord'
-require 'active_record/connection_adapters/oracle_enhanced_adapter'
+# require 'active_record/connection_adapters/oracle_enhanced_adapter'
+
+## TODO parameterize this ....
+ActiveRecord::Base.establish_connection({:adapter=>'sqlite3', :database=> ":memory:"})
+
+ActiveRecord::Base.connection.create_table :posts do |t|
+  t.string :title
+  t.text   :body
+end
+ActiveRecord::Base.connection.create_table :comments do |t|
+  t.integer :post_id
+  t.text    :body
+end
+
 
 # $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: legacy_data
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Alex Rothenberg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-08 00:00:00 -04:00
+date: 2009-10-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency