cleaning up; fixed gemspec

Author: laripk

lib/rails_sql_views/connection_adapters/postgresql_adapter.rb

@@ -2,60 +2,14 @@ module RailsSqlViews
   module ConnectionAdapters
     module PostgreSQLAdapter
       def self.included(base)
-   puts "\nmy postgres self.included", self.to_s, base.to_s
-   puts method_defined?(:tables), method_defined?(:tables_with_views_included)
-   puts base.method_defined?(:tables), base.method_defined?(:tables_with_views_included)
-   puts instance_methods.inspect, base.instance_methods.inspect
-
-        unless method_defined?(:tables_with_views_included)
-          base.alias_method_chain :tables, :views_included
-        else
-          alias_method :tables, :tables_with_views_included # still doesn't run the right one, grump
-        end
-        base.alias_method_chain :table_exists?, :views_included
-        
-   puts method_defined?(:tables_without_views_included)
-   puts base.method_defined?(:tables_without_views_included)
-   puts method_defined?(:table_exists_without_views_included?)
-   puts base.method_defined?(:table_exists_without_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?
         true
       end
 
-      def table_exists_with_views_included?(name)
-   puts "\nmy postgres table_exists?", "name #{name}"
-        name          = name.to_s
-        schema, table = name.split('.', 2)
-        unless table # A table was provided without a schema
-          table  = schema
-          schema = nil
-        end
-        if name =~ /^"/ # Handle quoted table names
-          table  = name
-          schema = nil
-        end
-    puts "schema #{schema}", "table #{table}"
-
-        query(<<-SQL).first[0].to_i > 0
-            SELECT COUNT(*)
-            FROM (
-               select schemaname, tablename as itemname
-               from pg_tables
-               union
-               select schemaname, viewname
-               from pg_views
-            ) combo
-            WHERE itemname = '#{table.gsub(/(^"|"$)/,'')}'
-            #{schema ? "AND schemaname = '#{schema}'" : ''}
-        SQL
-      end
-      
       def tables_with_views_included(name = nil)
-   puts "\nmy postgres tables"
         q = <<-SQL
         SELECT table_name, table_type
           FROM information_schema.tables

lib/rails_sql_views/loader.rb

@@ -7,10 +7,6 @@ def self.load_extensions
       SUPPORTED_ADAPTERS.each do |db|
         if ActiveRecord::ConnectionAdapters.const_defined?("#{db}Adapter")
           require "rails_sql_views/connection_adapters/#{db.downcase}_adapter"
-      puts "\nload_extensions"
-      klass = ActiveRecord::ConnectionAdapters.const_get("#{db}Adapter")
-      puts klass.class.to_s, klass.to_s
-      puts klass.class.method_defined?(:tables), klass.class.method_defined?(:tables_with_views_included)
           ActiveRecord::ConnectionAdapters.const_get("#{db}Adapter").class_eval do
             include RailsSqlViews::ConnectionAdapters::AbstractAdapter
             include RailsSqlViews::ConnectionAdapters.const_get("#{db}Adapter")

rails_sql_views.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_sql_views}
-  s.version = "0.8.0.1.laripk"
+  s.version = "0.8.0.2.laripk"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anthony Eden"]
-  s.date = %q{2011-06-03}
+  s.date = %q{2011-06-10}
   s.description = %q{Adds support for using SQL views within ActiveRecord}
   s.email = %q{[email protected]}
   s.extra_rdoc_files = [
@@ -53,10 +53,11 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rake>, ["= 0.8.7"])
       s.add_runtime_dependency(%q<rails>, ["~> 3.0.7"])
-      s.add_runtime_dependency(%q<mysql2>, ["= 0.2.7"])
       s.add_development_dependency(%q<jeweler>, ["= 1.6.2"])
       s.add_development_dependency(%q<flexmock>, ["= 0.9.0"])
       s.add_development_dependency(%q<test-unit>, ["= 2.3.0"])
+      s.add_development_dependency(%q<mysql2>, ["= 0.2.7"])
+      s.add_development_dependency(%q<pg>, ["= 0.11.0"])
       s.add_runtime_dependency(%q<activerecord>, [">= 0"])
       s.add_development_dependency(%q<flexmock>, [">= 0"])
       s.add_development_dependency(%q<pg>, [">= 0"])
@@ -65,10 +66,11 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<rake>, ["= 0.8.7"])
       s.add_dependency(%q<rails>, ["~> 3.0.7"])
-      s.add_dependency(%q<mysql2>, ["= 0.2.7"])
       s.add_dependency(%q<jeweler>, ["= 1.6.2"])
       s.add_dependency(%q<flexmock>, ["= 0.9.0"])
       s.add_dependency(%q<test-unit>, ["= 2.3.0"])
+      s.add_dependency(%q<mysql2>, ["= 0.2.7"])
+      s.add_dependency(%q<pg>, ["= 0.11.0"])
       s.add_dependency(%q<activerecord>, [">= 0"])
       s.add_dependency(%q<flexmock>, [">= 0"])
       s.add_dependency(%q<pg>, [">= 0"])
@@ -78,10 +80,11 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<rake>, ["= 0.8.7"])
     s.add_dependency(%q<rails>, ["~> 3.0.7"])
-    s.add_dependency(%q<mysql2>, ["= 0.2.7"])
     s.add_dependency(%q<jeweler>, ["= 1.6.2"])
     s.add_dependency(%q<flexmock>, ["= 0.9.0"])
     s.add_dependency(%q<test-unit>, ["= 2.3.0"])
+    s.add_dependency(%q<mysql2>, ["= 0.2.7"])
+    s.add_dependency(%q<pg>, ["= 0.11.0"])
     s.add_dependency(%q<activerecord>, [">= 0"])
     s.add_dependency(%q<flexmock>, [">= 0"])
     s.add_dependency(%q<pg>, [">= 0"])