qubole_rails_sql_views 0.10.1 → 0.10.3

data/Rakefile

@@ -8,7 +8,7 @@ require File.join(File.dirname(__FILE__), 'lib/qubole_rails_sql_views', 'version
 
 PKG_BUILD       = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME        = 'qubole_rails_sql_views'
-PKG_VERSION     = QuboleRailsSqlViews::VERSION::STRING + PKG_BUILD
+PKG_VERSION     = RailsSqlViews::VERSION::STRING + PKG_BUILD
 PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_DESTINATION = ENV["PKG_DESTINATION"] || "../#{PKG_NAME}"
 
@@ -53,7 +53,7 @@ begin
     s.name = "qubole_rails_sql_views"
     s.summary = "Library which adds SQL Views to ActiveRecord."
     s.email = "josh@technicalpickles.com"
-    s.homepage = "http://github.com/vrajat/rails_sql_views"
+    s.homepage = "http://activewarehouse.rubyforge.org/qubole_rails_sql_views"
     s.description = "Adds support for using SQL views within ActiveRecord"
     s.authors = ["Anthony Eden"]
     s.files =  FileList[
@@ -63,6 +63,10 @@ begin
       "{bin,lib}/**/*"
     ]
     s.add_dependency 'activerecord'
+    s.add_development_dependency 'flexmock'
+    s.add_development_dependency 'pg'
+    s.add_development_dependency 'mysql'
+    s.add_development_dependency 'mysql2'
   end
 rescue LoadError
   puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
@@ -70,5 +74,5 @@ end
 
 desc "Publish the API documentation"
 task :pdoc => [:rdoc] do 
-  Rake::SshDirPublisher.new("aeden@rubyforge.org", "/var/www/gforge-projects/activewarehouse/rails_sql_views/rdoc", "rdoc").upload
+  Rake::SshDirPublisher.new("aeden@rubyforge.org", "/var/www/gforge-projects/activewarehouse/qubole_rails_sql_views/rdoc", "rdoc").upload
 end

data/lib/active_record/view.rb

@@ -43,11 +43,11 @@ module ActiveRecord # :nodoc:
               end
           case r.macro
           when :belongs_to
-            if self.column_names.include?(r.primary_key_name.to_s)
+            if self.column_names.include?(r.foreign_key.to_s)
               if !r.options[:foreign_type] || self.column_names.include?(r.options[:foreign_type])
                 options = r.options.merge(
                   :class_name => r.class_name,
-                  :foreign_key => r.primary_key_name
+                  :foreign_key => r.foreign_key
                 )
                 belongs_to r.name, options
               end
@@ -56,13 +56,13 @@ module ActiveRecord # :nodoc:
             ### TODO :through assocications
             options = r.options.merge(
               :class_name => r.class_name,
-              :foreign_key => r.primary_key_name
+              :foreign_key => r.foreign_key
             )
             has_many r.name, options
           when :has_and_belongs_to_many
             options = r.options.merge(
               :class_name => r.class_name,
-              :foreign_key => r.primary_key_name,
+              :foreign_key => r.foreign_key,
               :association_foreign_key => r.association_foreign_key
             )
             has_and_belongs_to_many r.name, options

data/lib/qubole_rails_sql_views/connection_adapters/mysql2_adapter.rb

@@ -0,0 +1,62 @@
+module QuboleRailsSqlViews
+  module ConnectionAdapters
+    module Mysql2Adapter
+      def self.included(base)
+        if base.private_method_defined?(:supports_views?) || base.protected_method_defined?(:supports_views?)
+          base.send(:public, :supports_views?)
+        end
+      end
+
+      # Returns true as this adapter supports views.
+      def supports_views?
+        true
+      end
+      
+      def base_tables(name = nil) #:nodoc:
+        tables = []
+        execute("SHOW FULL TABLES WHERE TABLE_TYPE='BASE TABLE'").each{|row| tables << row[0]}
+        tables
+      end
+      alias nonview_tables base_tables
+      
+      def views(name = nil) #:nodoc:
+        views = []
+        execute("SHOW FULL TABLES WHERE TABLE_TYPE='VIEW'").each{|row| views << row[0]}
+        views
+      end
+
+      def tables_with_views_included(name = nil)
+        nonview_tables(name) + views(name)
+      end
+      
+      def structure_dump
+        structure = ""
+        base_tables.each do |table|
+          structure += select_one("SHOW CREATE TABLE #{quote_table_name(table)}")["Create Table"] + ";\n\n"
+        end
+
+        views.each do |view|
+          structure += select_one("SHOW CREATE VIEW #{quote_table_name(view)}")["Create View"] + ";\n\n"
+        end
+
+        return structure
+      end
+
+      # Get the view select statement for the specified table.
+      def view_select_statement(view, name=nil)
+        begin
+          row = execute("SHOW CREATE VIEW #{view}", name).each do |row|
+            return convert_statement(row[1]) if row[0] == view
+          end
+        rescue ActiveRecord::StatementInvalid => e
+          raise "No view called #{view} found"
+        end
+      end
+      
+      private
+      def convert_statement(s)
+        s.gsub!(/.* AS (select .*)/, '\1')
+      end
+    end
+  end
+end

data/lib/qubole_rails_sql_views/connection_adapters/mysql_adapter.rb

@@ -1,9 +1,13 @@
 module QuboleRailsSqlViews
   module ConnectionAdapters
     module MysqlAdapter
+      REQUIRED_METHODS = [:supports_views?]
+
       def self.included(base)
-        if base.private_method_defined?(:supports_views?)
-          base.send(:public, :supports_views?)
+        base.class_eval do
+          def self.method_added(method)
+            public(method) if REQUIRED_METHODS.include?(method) && !self.public_method_defined?(method)
+          end
         end
       end
 
@@ -18,7 +22,7 @@ module QuboleRailsSqlViews
         tables
       end
       alias nonview_tables base_tables
-      
+
       def views(name = nil) #:nodoc:
         views = []
         execute("SHOW FULL TABLES WHERE TABLE_TYPE='VIEW'").each{|row| views << row[0]}
@@ -28,7 +32,7 @@ module QuboleRailsSqlViews
       def tables_with_views_included(name = nil)
         nonview_tables(name) + views(name)
       end
-      
+
       def structure_dump
         structure = ""
         base_tables.each do |table|
@@ -52,7 +56,7 @@ module QuboleRailsSqlViews
           raise "No view called #{view} found"
         end
       end
-      
+
       private
       def convert_statement(s)
         s.gsub!(/.* AS (select .*)/, '\1')

data/lib/qubole_rails_sql_views/connection_adapters/postgresql_adapter.rb

@@ -2,7 +2,7 @@ module QuboleRailsSqlViews
   module ConnectionAdapters
     module PostgreSQLAdapter
       def self.included(base)
-        base.alias_method_chain :tables, :views_included
+        base.alias_method_chain :tables, :views_included unless method_defined?(:tables_with_views_included)
       end
       # Returns true as this adapter supports views.
       def supports_views?

data/lib/qubole_rails_sql_views/loader.rb

@@ -10,6 +10,8 @@ module QuboleRailsSqlViews
           ActiveRecord::ConnectionAdapters.const_get("#{db}Adapter").class_eval do
             include QuboleRailsSqlViews::ConnectionAdapters::AbstractAdapter
             include QuboleRailsSqlViews::ConnectionAdapters.const_get("#{db}Adapter")
+            # prevent reloading extension when the environment is reloaded
+            $qubole_rails_sql_views_included = true
           end
         end
       end

data/lib/qubole_rails_sql_views/schema_dumper.rb

@@ -26,6 +26,7 @@ module QuboleRailsSqlViews
     def dump_with_views(stream)
       dump_without_views(stream)
       begin
+        @connection.class.send(:public, :supports_views?) # this is a kluge, but I don't know why it's changing back to private before it gets here
         if @connection.supports_views?
           views(stream)
         end

data/lib/qubole_rails_sql_views/version.rb

@@ -1,8 +1,8 @@
 module QuboleRailsSqlViews
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 7
-    TINY  = 0
+    MINOR = 10
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/qubole_rails_sql_views.rb

@@ -33,10 +33,14 @@ require 'qubole_rails_sql_views/connection_adapters/abstract_adapter'
 require 'qubole_rails_sql_views/schema_dumper'
 require 'qubole_rails_sql_views/loader'
 
+$qubole_rails_sql_views_included = false
+
 ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
   include QuboleRailsSqlViews::ConnectionAdapters::SchemaStatements
   def self.inherited(sub)
-    QuboleRailsSqlViews::Loader.load_extensions
+    unless $qubole_rails_sql_views_included && (Rails.env.test? || Rails.env.cucumber?)
+      QuboleRailsSqlViews::Loader.load_extensions 
+    end
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qubole_rails_sql_views
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 10
-  - 1
-  version: 0.10.1
+  - 3
+  version: 0.10.3
 platform: ruby
 authors: 
 - Anthony Eden
@@ -15,12 +15,124 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 Z
+date: 2011-06-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 3
+        - 1
+        - 1
+        version: 3.1.1
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 6
+        - 2
+        version: 1.6.2
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: flexmock
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
+        version: 2.3.0
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: mysql2
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 3
+        - 10
+        version: 0.3.10
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: pg
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 11
+        - 0
+        version: 0.11.0
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,7 +142,63 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: flexmock
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: pg
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: mysql
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: mysql2
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id012
 description: Adds support for using SQL views within ActiveRecord
 email: josh@technicalpickles.com
 executables: []
@@ -51,6 +219,7 @@ files:
 - lib/qubole_rails_sql_views/connection_adapters/abstract/schema_definitions.rb
 - lib/qubole_rails_sql_views/connection_adapters/abstract/schema_statements.rb
 - lib/qubole_rails_sql_views/connection_adapters/abstract_adapter.rb
+- lib/qubole_rails_sql_views/connection_adapters/mysql2_adapter.rb
 - lib/qubole_rails_sql_views/connection_adapters/mysql_adapter.rb
 - lib/qubole_rails_sql_views/connection_adapters/oci_adapter.rb
 - lib/qubole_rails_sql_views/connection_adapters/oracle_adapter.rb
@@ -65,29 +234,12 @@ files:
 - lib/qubole_rails_sql_views/version.rb
 - LICENSE
 - TODO
-- test/adapter_test.rb
-- test/connection/native_mysql/connection.rb
-- test/connection/native_postgresql/connection.rb
-- test/connection/oracle_enhanced/connection.rb
-- test/models/item.rb
-- test/models/person.rb
-- test/models/person2.rb
-- test/models/place.rb
-- test/models/v_person.rb
-- test/models/v_profile.rb
-- test/schema.native_mysql.expected.rb
-- test/schema.native_postgresql.expected.rb
-- test/schema.oracle_enhanced.expected.rb
-- test/schema_dumper_test.rb
-- test/test_helper.rb
-- test/view_model_test.rb
-- test/view_operations_test.rb
-homepage: http://github.com/vrajat/rails_sql_views
+homepage: http://activewarehouse.rubyforge.org/qubole_rails_sql_views
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -102,12 +254,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -115,21 +269,5 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Library which adds SQL Views to ActiveRecord.
-test_files: 
-- test/adapter_test.rb
-- test/connection/native_mysql/connection.rb
-- test/connection/native_postgresql/connection.rb
-- test/connection/oracle_enhanced/connection.rb
-- test/models/item.rb
-- test/models/person.rb
-- test/models/person2.rb
-- test/models/place.rb
-- test/models/v_person.rb
-- test/models/v_profile.rb
-- test/schema.native_mysql.expected.rb
-- test/schema.native_postgresql.expected.rb
-- test/schema.oracle_enhanced.expected.rb
-- test/schema_dumper_test.rb
-- test/test_helper.rb
-- test/view_model_test.rb
-- test/view_operations_test.rb
+test_files: []
+

data/test/adapter_test.rb

@@ -1,82 +0,0 @@
-require "#{File.dirname(__FILE__)}/test_helper"
-
-class AdapterTest < Test::Unit::TestCase
-  def test_current_database
-    if ActiveRecord::Base.connection.respond_to?(:current_database)
-      assert_equal 'rails_sql_views_unittest', ActiveRecord::Base.connection.current_database
-    end
-  end
-  def test_tables
-    create_view
-    found = ActiveRecord::Base.connection.tables.sort
-    found.delete(ActiveRecord::Migrator.schema_migrations_table_name)
-    assert_equal ["items", "items_people", "people", "people2", "places", "v_people"], found
-  end
-  def test_base_tables
-    create_view
-    found = ActiveRecord::Base.connection.base_tables.sort
-    found.delete(ActiveRecord::Migrator.schema_migrations_table_name)
-    assert_equal ["items", "items_people", "people", "people2", "places"], found
-  end
-  def test_views
-    create_view
-    assert_equal ['v_people'], ActiveRecord::Base.connection.views
-  end
-  def test_columns
-    create_view
-    assert_equal ["f_name", "l_name", "social_security"], ActiveRecord::Base.connection.columns('v_people').collect { |c| c.name }
-  end
-  def test_supports_views
-    assert ActiveRecord::Base.connection.supports_views?
-  end
-  
-  def test_mapped_views
-    create_mapping
-    assert_equal ['v_people'], ActiveRecord::Base.connection.views
-  end
-  def test_mapped_columns
-    create_mapping
-    assert_equal ["f_name", "l_name", "address_id"], ActiveRecord::Base.connection.columns('v_people').collect { |c| c.name }
-  end
-  
-  def test_view_select_statement
-    case ActiveRecord::Base.connection.adapter_name
-    when "MySQL"
-      assert_equal "select `people`.`first_name` AS `f_name`,`people`.`last_name` AS `l_name`,`people`.`ssn` AS `social_security` from `people`", ActiveRecord::Base.connection.view_select_statement('v_people')
-    when "PostgreSQL"
-      assert_equal "SELECT people.first_name AS f_name, people.last_name AS l_name, people.ssn AS social_security FROM people;", ActiveRecord::Base.connection.view_select_statement('v_people')
-    end
-  end
-  
-  def test_old_name_not_found_error_during_mapping
-    assert_raise ActiveRecord::ActiveRecordError do
-      ActiveRecord::Base.connection.create_mapping_view(:people, :v_people, :force => true) do |v|
-        v.map_column :foo, :bar
-      end
-    end
-  end
- 
-### TODO
-#  def test_only_base_table_triggers_are_dropped_for_disabled_ref_integrity
-#    ActiveRecord::Base.connection.disable_referential_integrity do
-#    end
-#  end
-  
-  private
-  def create_view
-    ActiveRecord::Base.connection.create_view(:v_people, 'select first_name, last_name, ssn from people', :force => true) do |v|
-      v.column :f_name
-      v.column :l_name
-      v.column :social_security
-    end
-  end
-  
-  def create_mapping
-    ActiveRecord::Base.connection.create_mapping_view(:people, :v_people, :force => true) do |v|
-      v.map_column :id, nil
-      v.map_column :first_name, :f_name
-      v.map_column :last_name, :l_name
-      v.map_column :ssn, nil
-    end
-  end
-end

data/test/connection/native_mysql/connection.rb

@@ -1,32 +0,0 @@
-print "Using native MySQL\n"
-
-adapter_name = 'mysql'
-config = YAML.load_file(File.join(File.dirname(__FILE__), '/../../connection.yml'))[adapter_name]
-
-#require 'logger'
-#ActiveRecord::Base.logger = Logger.new("debug.log")
-
-ActiveRecord::Base.silence do
-  ActiveRecord::Base.configurations = {
-    config['database'] => {
-    :adapter  => adapter_name,
-    :username => config['username'],
-    :password => config['password'],
-    :host     => config['host'],
-    :database => config['database'],
-    :encoding => config['encoding'],
-    :schema_file => config['schema_file'],
-  }
-  }
-
-  ActiveRecord::Base.establish_connection config['database']
-  ActiveRecord::Migration.verbose = false
-
-  puts "Resetting database"
-  conn = ActiveRecord::Base.connection
-  conn.recreate_database(conn.current_database)
-  conn.reconnect!
-  lines = open(File.join(File.dirname(__FILE__), ActiveRecord::Base.configurations[config['database']][:schema_file])).readlines
-  lines.join.split(';').each { |line| conn.execute(line) }
-  conn.reconnect!
-end

data/test/connection/native_postgresql/connection.rb

@@ -1,31 +0,0 @@
-print "Using native PostgreSQL\n"
-
-adapter_name = 'postgresql'
-config = YAML.load_file(File.join(File.dirname(__FILE__), '/../../connection.yml'))[adapter_name]
-
-#require 'logger'
-#ActiveRecord::Base.logger = Logger.new("debug.log")
-
-ActiveRecord::Base.silence do
-  ActiveRecord::Base.configurations = {
-  'rails_sql_views_unittest' => {
-    :adapter  => adapter_name,
-    :username => config['username'],
-    :password => config['password'],
-    :host     => config['host'],
-    :database => config['database'],
-    :encoding => config['encoding'],
-    :schema_file => config['schema_file'],
-  }
-  }
-
-  ActiveRecord::Base.establish_connection config['database']
-
-  puts "Resetting database"
-  conn = ActiveRecord::Base.connection
-  #conn.recreate_database(conn.current_database)
-  conn.reconnect!
-  lines = open(File.join(File.dirname(__FILE__), ActiveRecord::Base.configurations[config['database']][:schema_file])).readlines
-  lines.join.split(';').each { |line| conn.execute(line) }
-  conn.reconnect!
-end

data/test/connection/oracle_enhanced/connection.rb

@@ -1,29 +0,0 @@
-print "Using Oracle Enhanced\n"
-
-#require 'logger'
-#ActiveRecord::Base.logger = Logger.new("debug.log")
-
-ActiveRecord::Base.configurations = {
-  'rails_sql_views_unittest' => {
-    :adapter  => :oracle_enhanced,
-    :username => 'rails_sql_views_unittest',
-    :password => 'rails',
-    :host     => 'localhost',
-    :database => 'mydev',
-    :encoding => 'utf8',
-    :procedures_file  => 'procedures.sql',
-    :schema_file      => 'schema.sql',
-  }
-}
-
-ActiveRecord::Base.establish_connection 'rails_sql_views_unittest'
-
-puts "Resetting database"
-conn = ActiveRecord::Base.connection
-#conn.recreate_database(conn.current_database)
-conn.reconnect!
-[:procedures_file, :schema_file].each do |file|
-  lines = open(File.join(File.dirname(__FILE__), ActiveRecord::Base.configurations['rails_sql_views_unittest'][file])).readlines
-  conn.execute(lines.to_s)
-end
-conn.reconnect!

data/test/models/item.rb

@@ -1,4 +0,0 @@
-class Item < ActiveRecord::Base
-  belongs_to :person
-  has_and_belongs_to_many :people
-end

data/test/models/person.rb

@@ -1,5 +0,0 @@
-class Person < ActiveRecord::Base
-  belongs_to :address, :class_name => 'Place', :foreign_key => :address_id
-  has_many :owned_items, :class_name => 'Item'
-  has_and_belongs_to_many :shared_items, :class_name => 'Item'
-end

data/test/models/person2.rb

@@ -1,3 +0,0 @@
-class Person2 < ActiveRecord::Base
-  set_table_name :people2
-end

data/test/models/place.rb

@@ -1,2 +0,0 @@
-class Place < ActiveRecord::Base
-end

data/test/models/v_person.rb

@@ -1,4 +0,0 @@
-require 'active_record/view'
-
-class VPerson < ActiveRecord::View
-end

data/test/models/v_profile.rb

@@ -1,3 +0,0 @@
-class VProfile < ActiveRecord::Base
-  
-end

data/test/schema.native_mysql.expected.rb

@@ -1,51 +0,0 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
-# please use the migrations feature of Active Record to incrementally modify your database, and
-# then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your database schema. If you need
-# to create the application database on another system, you should be using db:schema:load, not running
-# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 0) do
-
-  create_table "items", :force => true do |t|
-    t.integer "person_id"
-  end
-
-  create_table "items_people", :id => false, :force => true do |t|
-    t.integer "person_id"
-    t.integer "item_id"
-  end
-
-  create_table "people", :force => true do |t|
-    t.string  "first_name"
-    t.string  "last_name"
-    t.string  "ssn",        :limit => 64
-    t.integer "address_id"
-  end
-
-  create_table "people2", :force => true do |t|
-    t.string "first_name"
-    t.string "last_name"
-    t.string "ssn",        :limit => 64
-  end
-
-  create_table "places", :force => true do |t|
-    t.text   "address"
-    t.string "city"
-    t.string "cstate"
-    t.string "country", :limit => 2
-  end
-
-  create_view "v_people", "select `people`.`id` AS `id`,`people`.`first_name` AS `f_name`,`people`.`last_name` AS `l_name`,`people`.`ssn` AS `social_security`,`people`.`address_id` AS `address_id` from `people`", :force => true do |v|
-    v.column :id
-    v.column :f_name
-    v.column :l_name
-    v.column :social_security
-    v.column :address_id
-  end
-
-end

data/test/schema.native_postgresql.expected.rb

@@ -1,51 +0,0 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
-# please use the migrations feature of Active Record to incrementally modify your database, and
-# then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your database schema. If you need
-# to create the application database on another system, you should be using db:schema:load, not running
-# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 0) do
-
-  create_table "items", :force => true do |t|
-    t.integer "person_id"
-  end
-
-  create_table "items_people", :id => false, :force => true do |t|
-    t.integer "person_id"
-    t.integer "item_id"
-  end
-
-  create_table "people", :force => true do |t|
-    t.string  "first_name"
-    t.string  "last_name"
-    t.string  "ssn",        :limit => 64
-    t.integer "address_id"
-  end
-
-  create_table "people2", :force => true do |t|
-    t.string "first_name"
-    t.string "last_name"
-    t.string "ssn",        :limit => 64
-  end
-
-  create_table "places", :force => true do |t|
-    t.text   "address"
-    t.string "city"
-    t.string "cstate"
-    t.string "country", :limit => 2
-  end
-
-  create_view "v_people", "SELECT people.id, people.first_name AS f_name, people.last_name AS l_name, people.ssn AS social_security, people.address_id FROM people;", :force => true do |v|
-    v.column :id
-    v.column :f_name
-    v.column :l_name
-    v.column :social_security
-    v.column :address_id
-  end
-
-end

data/test/schema.oracle_enhanced.expected.rb

@@ -1,51 +0,0 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
-# please use the migrations feature of Active Record to incrementally modify your database, and
-# then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your database schema. If you need
-# to create the application database on another system, you should be using db:schema:load, not running
-# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 0) do
-
-  create_table "items", :force => true do |t|
-    t.integer "person_id", :precision => 38, :scale => 0
-  end
-
-  create_table "items_people", :id => false, :force => true do |t|
-    t.integer "person_id", :precision => 38, :scale => 0
-    t.integer "item_id",   :precision => 38, :scale => 0
-  end
-
-  create_table "people", :force => true do |t|
-    t.string  "first_name"
-    t.string  "last_name"
-    t.string  "ssn",        :limit => 64
-    t.integer "address_id",               :precision => 38, :scale => 0
-  end
-
-  create_table "people2", :force => true do |t|
-    t.string "first_name"
-    t.string "last_name"
-    t.string "ssn",        :limit => 64
-  end
-
-  create_table "places", :force => true do |t|
-    t.string "address", :limit => 2000
-    t.string "city"
-    t.string "cstate"
-    t.string "country", :limit => 2
-  end
-
-  create_view "v_people", "select id, first_name, last_name, ssn, address_id from people", :force => true do |v|
-    v.column :id
-    v.column :f_name
-    v.column :l_name
-    v.column :social_security
-    v.column :address_id
-  end
-
-end

data/test/schema_dumper_test.rb

@@ -1,117 +0,0 @@
-require "#{File.dirname(__FILE__)}/test_helper"
-require 'active_record/schema_dumper'
-
-class SchemaDumperTest < Test::Unit::TestCase
-  def setup
-    teardown
-  end
-  def teardown
-    ['V_PEOPLE', 'V_PROFILE'].each do |view|
-      if ActiveRecord::Base.connection.adapter_name == 'OracleEnhanced'
-        ActiveRecord::Base.connection.execute("
-          DECLARE
-            CURSOR C1 is SELECT view_name FROM user_views where view_name = '#{view}';
-          BEGIN
-            FOR I IN C1 LOOP
-              EXECUTE IMMEDIATE 'DROP VIEW '||I.view_name||'';
-            END LOOP;
-          END;
-        ");
-      else
-        ActiveRecord::Base.connection.execute("drop view if exists #{view}")
-      end
-    end
-  end
-  def test_view
-    create_people_view
-    stream = StringIO.new
-    dumper = ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
-    stream.rewind
-    assert_equal File.open(File.dirname(__FILE__) + "/schema.#{$connection}.expected.rb", 'r').readlines, stream.readlines
-  end
-  def test_dump_and_load
-    create_people_view
-    assert_dump_and_load_succeed
-  end
-  def test_union
-    Person.create(:first_name => 'Joe', :last_name => 'User', :ssn => '123456789')
-    Person2.create(:first_name => 'Jane', :last_name => 'Doe', :ssn => '222334444')
-    
-    select_stmt = <<-HERE
-      select first_name, last_name, ssn from people
-      UNION
-      select first_name, last_name, ssn from people2
-    HERE
-    
-    ActiveRecord::Base.connection.create_view(:v_profile, select_stmt, :force => true) do |v|
-      v.column :first_name
-      v.column :last_name
-      v.column :ssn
-    end
-    
-    assert_dump_and_load_succeed
-  end
-  def test_view_creation_order
-    ActiveRecord::SchemaDumper.view_creation_order << :v_people
-    create_people_view
-    assert_dump_and_load_succeed
-    ActiveRecord::SchemaDumper.view_creation_order.pop
-  end
-  def test_symbol_ignore
-    ActiveRecord::SchemaDumper.ignore_views << :v_people
-    create_people_view
-    assert_dump_and_load_succeed
-    ActiveRecord::SchemaDumper.ignore_views.pop
-  end
-  def test_regex_ignore
-    ActiveRecord::SchemaDumper.ignore_views << Regexp.new(/v_people/)
-    create_people_view
-    assert_dump_and_load_succeed
-    ActiveRecord::SchemaDumper.ignore_views.pop
-  end
-  def test_non_allowed_object_raises_error
-    create_people_view
-    ActiveRecord::SchemaDumper.ignore_views << 0
-    begin
-      schema_file = File.dirname(__FILE__) + "/schema.#{$connection}.out.rb"
-      File.open(schema_file, "w") do |file|
-        assert_raise(StandardError) do
-          ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
-        end
-      end
-    ensure
-      ActiveRecord::SchemaDumper.ignore_views.pop
-    end
-  end
-  
-  def test_logging_error
-    ActiveRecord::SchemaDumper.ignore_views << 0
-    old_logger = ActiveRecord::Base.logger
-    
-    begin
-      mock_logger = flexmock('logger', :error => nil)
-      mock_logger.should_receive(:error)
-      ActiveRecord::Base.logger = mock_logger
-      schema_file = File.dirname(__FILE__) + "/schema.#{$connection}.out.rb"
-      File.open(schema_file, "w") do |file|
-        ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
-      end
-    ensure
-      ActiveRecord::SchemaDumper.ignore_views.pop
-      ActiveRecord::Base.logger = old_logger
-    end
-  end
-  
-  def assert_dump_and_load_succeed
-    schema_file = File.dirname(__FILE__) + "/schema.#{$connection}.out.rb"
-    assert_nothing_raised do
-      File.open(schema_file, "w") do |file|
-        ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
-      end
-    end
-
-    assert_nothing_raised do
-      load(schema_file)
-    end
-  end
-end

data/test/test_helper.rb

@@ -1,30 +0,0 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-$:.unshift(File.dirname(__FILE__))
-
-require 'rubygems'
-require 'test/unit'
-require 'pp'
-require 'flexmock/test_unit'
-
-require 'active_record'
-#$connection = (ENV['DB'] || 'native_mysql')
-$connection = (ENV['DB'] || 'native_postgresql')
-require "connection/#{$connection}/connection"
-require 'rails_sql_views'
-
-require 'models/person'
-require 'models/person2'
-require 'models/v_person'
-
-class Test::Unit::TestCase
-  def create_people_view
-    ActiveRecord::Base.connection.create_view(:v_people,
-        'select id, first_name, last_name, ssn, address_id from people', :force => true) do |v|
-      v.column :id
-      v.column :f_name
-      v.column :l_name
-      v.column :social_security
-      v.column :address_id
-    end
-  end
-end

data/test/view_model_test.rb

@@ -1,63 +0,0 @@
-require "#{File.dirname(__FILE__)}/test_helper"
-
-require 'models/item'
-require 'models/place'
-
-class ViewModelTest < Test::Unit::TestCase
-  
-  def setup
-    create_people_view
-    VPerson.send(:based_on, Person)
-    
-    @address = Place.create!
-    @person = Person.create!(:first_name => 'Primus', :address => @address)
-    @items = [ @person.owned_items.create!, @person.owned_items.create! ]
-    @sharable_items = [ Item.create!, Item.create!, Item.create! ]
-    @person.shared_items << @sharable_items[0]
-    @person.shared_items << @sharable_items[2]
-
-    @vperson = VPerson.find(@person.id)
-  end
-  
-  def cleanup
-    Item.delete_all
-    Person.delete_all
-    Place.delete_all
-  end
-  
-  def test_same_person
-    assert_equal @person.id, @vperson.id
-  end
-  
-  def test_cloned_belongs_to_association_exists
-    reflection = VPerson.reflect_on_association(:address)
-    assert_not_nil reflection
-  end
-  
-  def test_access_cloned_belongs_to_association
-    assert_equal @address, @vperson.address
-  end
-
-  def test_cloned_has_many_association_exists
-    reflection = VPerson.reflect_on_association(:owned_items)
-    assert_not_nil reflection
-  end
-
-  def test_access_cloned_has_many_association
-    items = @vperson.owned_items
-    assert_equal 2, items.size
-    assert_equal @items.sort_by(&:id), items.sort_by(&:id)
-  end
-
-  def test_cloned_habtm_association_exists
-    reflection = VPerson.reflect_on_association(:shared_items)
-    assert_not_nil reflection
-  end
-
-  def test_access_cloned_habtm_association
-    items = @vperson.shared_items
-    assert_equal 2, items.size
-    expected_items = [ @sharable_items[0], @sharable_items[2] ]
-    assert_equal expected_items.sort_by(&:id), items.sort_by(&:id)
-  end
-end

data/test/view_operations_test.rb

@@ -1,36 +0,0 @@
-require "#{File.dirname(__FILE__)}/test_helper"
-
-class ViewOperationsTest < Test::Unit::TestCase
-  def test_create_view
-    Person.create(:first_name => 'John', :last_name => 'Doe', :ssn => '123456789')
-    assert_nothing_raised do
-      ActiveRecord::Base.connection.create_view(:v_people,
-          'select first_name, last_name, ssn from people', :force => true) do |v|
-        v.column :f_name
-        v.column :l_name
-        v.column :social_security
-      end
-    end
-    p = Person.find(:first)
-    vp = VPerson.find(:first)
-    assert_equal p.first_name, vp.f_name
-  end
-  def test_drop_view
-    assert_nothing_raised do
-      ActiveRecord::Base.connection.create_view(:v_place,
-          'select address, city, cstate, country from places', :force => true) do |v|
-        v.column :v_address
-        v.column :v_city
-        v.column :v_state
-        v.column :v_country
-      end
-      ActiveRecord::Base.connection.drop_view(:v_place)
-    end
-    assert_raises(ActiveRecord::StatementInvalid) do
-      ActiveRecord::Base.connection.execute "SELECT * FROM v_place"
-    end
-  end
-  def test_no_view_raises_error
-    assert_raises(RuntimeError) { ActiveRecord::Base.connection.view_select_statement('foo') }
-  end
-end