activerecord-postgresql-extensions 0.0.12 → 0.1.0

data/test/test_helper.rb

@@ -1,61 +1,108 @@
 
-ACTIVERECORD_GEM_VERSION = ENV['ACTIVERECORD_GEM_VERSION'] || '~> 3.0.3'
+ACTIVERECORD_GEM_VERSION = ENV['ACTIVERECORD_GEM_VERSION'] || '~> 3.2.0'
 
 require 'rubygems'
 gem 'activerecord', ACTIVERECORD_GEM_VERSION
 
 require 'active_record'
 require 'test/unit'
+require 'logger'
 require File.join(File.dirname(__FILE__), *%w{ .. lib activerecord-postgresql-extensions })
 
+ActiveRecord::Base.logger = Logger.new("debug.log") if ENV['ENABLE_LOGGER']
 ActiveRecord::Base.configurations = {
-  'arunit' => {
-    :adapter => 'postgresql',
-    :database => 'postgresql_extensions_unit_tests',
-    :min_messages => 'warning'
-  }
+  'arunit' => {}
 }
 
-ActiveRecord::Base.establish_connection 'arunit'
-#ActiveRecord::Base.connection.drop_database('postgresql_extensions_unit_tests')
-#ActiveRecord::Base.connection.create_database('postgresql_extensions_unit_tests')
+%w{
+  database.yml
+  local_database.yml
+}.each do |file|
+  file = File.join('test', file)
+
+  next unless File.exists?(file)
+
+  configuration = YAML.load(File.read(file))
+
+  if configuration['arunit']
+    ActiveRecord::Base.configurations['arunit'].merge!(configuration['arunit'])
+  end
 
+  if defined?(JRUBY_VERSION) && configuration['jdbc']
+    ActiveRecord::Base.configurations['arunit'].merge!(configuration['jdbc'])
+  end
+end
+
+ActiveRecord::Base.establish_connection 'arunit'
 ARBC = ActiveRecord::Base.connection
 
 puts "Testing against ActiveRecord #{Gem.loaded_specs['activerecord'].version.to_s}"
-if postgresql_version = ARBC.query('SELECT version()').flatten.to_s
+if postgresql_version = ARBC.select_rows('SELECT version()').first.first
   puts "PostgreSQL info from version(): #{postgresql_version}"
 end
 
+if postgis_version = ActiveRecord::PostgreSQLExtensions::PostGIS.VERSION[:lib]
+  puts "PostGIS info from postgis_full_version(): #{postgis_version}"
+else
+  puts "PostGIS not installed"
+end
+
 class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
   def statements
     @statements ||= []
   end
 
-  def execute_with_statement_capture(sql, name = nil)
-    statements << sql
-    #execute_without_statement_capture(sql, name)
-  end
-  alias_method_chain :execute, :statement_capture
+  def execute_with_statement_capture(*args)
+    PostgreSQLExtensionsTestHelper.add_statement(args.first)
+
+    if RUBY_PLATFORM == 'java'
+      if args.first =~ /pg_tables/
+        return execute_without_statement_capture(*args)
+      end
+    end
 
-  def query_with_statement_capture(sql, name = nil)
-    statements << sql
-    #query_without_statement_capture(sql, name)
+    args.first
   end
-  alias_method_chain :query, :statement_capture
+  alias_method_chain :execute, :statement_capture
 
-  def clear_statements!
-    @statements = []
+  unless RUBY_PLATFORM == 'java'
+    def query_with_statement_capture(*args)
+      PostgreSQLExtensionsTestHelper.add_statement(args.first)
+      #query_without_statement_capture(*args)
+    end
+    alias_method_chain :query, :statement_capture
   end
 end
 
 module PostgreSQLExtensionsTestHelper
+  class << self
+    def statements
+      @statements ||= []
+    end
+
+    def clear_statements!
+      @statements = []
+    end
+
+    def add_statement(sql)
+      case sql
+        when /SHOW search_path;/, /pg_tables/
+          # ignore
+        else
+          ActiveRecord::Base.logger.debug(sql) if ENV['ENABLE_LOGGER']
+          self.statements << sql
+      end
+
+      sql
+    end
+  end
+
   def clear_statements!
-    ActiveRecord::Base.connection.clear_statements!
+    PostgreSQLExtensionsTestHelper.clear_statements!
   end
 
   def statements
-    ActiveRecord::Base.connection.statements
+    PostgreSQLExtensionsTestHelper.statements
   end
 
   def setup

data/test/trigger_tests.rb

@@ -15,7 +15,7 @@ class TriggerTests < Test::Unit::TestCase
       %{ALTER TABLE "foos" ENABLE TRIGGER "bar";},
       %{ALTER TABLE "foos" ENABLE TRIGGER "bar";},
       %{ALTER TABLE "foos" ENABLE TRIGGER "baz";}
-    ], ARBC.statements)
+    ], statements)
   end
 
   def test_disable_triggers
@@ -28,7 +28,7 @@ class TriggerTests < Test::Unit::TestCase
       %{ALTER TABLE "foos" DISABLE TRIGGER "bar";},
       %{ALTER TABLE "foos" DISABLE TRIGGER "bar";},
       %{ALTER TABLE "foos" DISABLE TRIGGER "baz";}
-    ], ARBC.statements)
+    ], statements)
   end
 
   def test_without_triggers
@@ -62,7 +62,7 @@ class TriggerTests < Test::Unit::TestCase
       %{ALTER TABLE "foos" DISABLE TRIGGER "baz";},
       %{ALTER TABLE "foos" ENABLE TRIGGER "bar";},
       %{ALTER TABLE "foos" ENABLE TRIGGER "baz";}
-    ], ARBC.statements)
+    ], statements)
   end
 
   def test_create_trigger # (name, called, events, table, function, options = {})
@@ -70,7 +70,7 @@ class TriggerTests < Test::Unit::TestCase
 
     assert_equal([
       %{CREATE TRIGGER "foo" BEFORE UPDATE ON "bar" FOR EACH ROW EXECUTE PROCEDURE "do_it"();}
-    ], ARBC.statements)
+    ], statements)
   end
 
   def test_drop_trigger # (name, table, options = {})
@@ -80,6 +80,6 @@ class TriggerTests < Test::Unit::TestCase
     assert_equal([
       %{DROP TRIGGER "bar" ON "foo";},
       %{DROP TRIGGER IF EXISTS "bar" ON "foo" CASCADE;}
-    ], ARBC.statements)
+    ], statements)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgresql-extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000 Z
-dependencies: []
+date: 2012-08-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: A whole bunch of extensions the ActiveRecord PostgreSQL adapter.
 email: code@zoocasa.com
 executables: []
@@ -18,33 +82,38 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- .gitignore
+- Gemfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - activerecord-postgresql-extensions.gemspec
+- lib/active_record/postgresql_extensions/adapter_extensions.rb
+- lib/active_record/postgresql_extensions/constraints.rb
+- lib/active_record/postgresql_extensions/extensions.rb
+- lib/active_record/postgresql_extensions/foreign_key_associations.rb
+- lib/active_record/postgresql_extensions/functions.rb
+- lib/active_record/postgresql_extensions/geometry.rb
+- lib/active_record/postgresql_extensions/indexes.rb
+- lib/active_record/postgresql_extensions/languages.rb
+- lib/active_record/postgresql_extensions/permissions.rb
+- lib/active_record/postgresql_extensions/postgis.rb
+- lib/active_record/postgresql_extensions/roles.rb
+- lib/active_record/postgresql_extensions/rules.rb
+- lib/active_record/postgresql_extensions/schemas.rb
+- lib/active_record/postgresql_extensions/sequences.rb
+- lib/active_record/postgresql_extensions/tables.rb
+- lib/active_record/postgresql_extensions/tablespaces.rb
+- lib/active_record/postgresql_extensions/text_search.rb
+- lib/active_record/postgresql_extensions/triggers.rb
+- lib/active_record/postgresql_extensions/types.rb
+- lib/active_record/postgresql_extensions/utils.rb
+- lib/active_record/postgresql_extensions/version.rb
+- lib/active_record/postgresql_extensions/views.rb
 - lib/activerecord-postgresql-extensions.rb
-- lib/postgresql_extensions/foreign_key_associations.rb
-- lib/postgresql_extensions/postgresql_adapter_extensions.rb
-- lib/postgresql_extensions/postgresql_constraints.rb
-- lib/postgresql_extensions/postgresql_extensions.rb
-- lib/postgresql_extensions/postgresql_functions.rb
-- lib/postgresql_extensions/postgresql_geometry.rb
-- lib/postgresql_extensions/postgresql_indexes.rb
-- lib/postgresql_extensions/postgresql_languages.rb
-- lib/postgresql_extensions/postgresql_permissions.rb
-- lib/postgresql_extensions/postgresql_roles.rb
-- lib/postgresql_extensions/postgresql_rules.rb
-- lib/postgresql_extensions/postgresql_schemas.rb
-- lib/postgresql_extensions/postgresql_sequences.rb
-- lib/postgresql_extensions/postgresql_tables.rb
-- lib/postgresql_extensions/postgresql_tablespaces.rb
-- lib/postgresql_extensions/postgresql_text_search.rb
-- lib/postgresql_extensions/postgresql_triggers.rb
-- lib/postgresql_extensions/postgresql_types.rb
-- lib/postgresql_extensions/postgresql_views.rb
 - test/adapter_tests.rb
 - test/constraints_tests.rb
+- test/database.yml
 - test/extensions_tests.rb
 - test/functions_tests.rb
 - test/geometry_tests.rb
@@ -80,8 +149,26 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A whole bunch of extensions the ActiveRecord PostgreSQL adapter.
-test_files: []
+test_files:
+- test/adapter_tests.rb
+- test/constraints_tests.rb
+- test/database.yml
+- test/extensions_tests.rb
+- test/functions_tests.rb
+- test/geometry_tests.rb
+- test/index_tests.rb
+- test/languages_tests.rb
+- test/permissions_tests.rb
+- test/roles_tests.rb
+- test/rules_tests.rb
+- test/schemas_tests.rb
+- test/sequences_tests.rb
+- test/tables_tests.rb
+- test/tablespace_tests.rb
+- test/test_helper.rb
+- test/text_search_tests.rb
+- test/trigger_tests.rb

data/VERSION

@@ -1 +0,0 @@
-0.0.12