adapter_extensions 0.9.5.rc1 → 0.9.5

data/CHANGELOG

@@ -1,6 +1,8 @@
-0.9.5 - not yet released
+0.9.5 - November 8, 2011
 * Add in REPLACE to LOAD DATA INFILE command (jayzes/kookster)
 * Remove FasterCSV from dependencies (not used apparently)
+* Allow to pass options (like RESTART IDENTITY) to truncate (thbar)
+* Don't print "Using AdapterExtensions" when required (thbar)
 
 0.5 - January 14, 2009
 * Updated dependencies for gem to current versions of ActiveRecord, ActiveSupport and Rake. May not be compatible with Rails versions less than 2.x.

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007 Anthony Eden
+Copyright (c) 2011 Anthony Eden
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
 associated documentation files (the "Software"), to deal in the Software without restriction, including 

data/README.md

@@ -0,0 +1,23 @@
+This library provides extensions to Rails' ActiveRecord adapters.
+
+As of version 0.9.5, adapter_extensions has dependencies on ActiveSupport and ActiveRecord 2.1.x or higher.
+
+### How to test
+
+Currently tested on MySQL and Postgres.
+
+#### Testing on MySQL
+
+see `test/connection/mysql/connection.rb` and tweek if needed, then:
+
+    mysql -u root -p -e "create database adapter_extensions_unittest"
+    rake test
+    
+One test should fail with 'known issue with MySQL' (see commit 75da4b08).
+
+#### Testing on Postgresql
+
+see `test/connection/postgresql/connection.rb` and tweek if needed, then:
+
+    createdb adapter_extensions_unittest
+    rake test DB=postgresql

data/lib/adapter_extensions/connection_adapters/abstract_adapter.rb

@@ -5,9 +5,15 @@ module ActiveRecord #:nodoc:
     # is provided, in others it is adapter-dependent and the method will
     # raise a NotImplementedError if the adapter does not implement that method
     class AbstractAdapter
-      # Truncate the specified table
-      def truncate(table_name)
-        execute("TRUNCATE TABLE #{table_name}")
+      # Truncate the specified table - allow to pass an optional string
+      # to let the called add extra parameters like RESET IDENTITY for pg
+      def truncate(table_name, options=nil)
+        statement = [
+          'TRUNCATE TABLE',
+          table_name,
+          options
+        ].compact.join(' ')
+        execute(statement)
       end
       
       # Bulk loading interface. Load the data from the specified file into the

data/lib/adapter_extensions/connection_adapters/mysql_adapter.rb

@@ -77,7 +77,6 @@ module ActiveRecord #:nodoc:
         q << " IGNORE #{options[:ignore]} LINES" if options[:ignore]
         q << " (#{options[:columns].map { |c| quote_column_name(c.to_s) }.join(',')})" if options[:columns]
 
-        puts q
         if options[:disable_keys]
           with_keys_disabled(table_name) { execute(q) }
         else

data/lib/adapter_extensions/version.rb

@@ -1,4 +1,4 @@
 # Source file identifying the version of AdapterExtensions in this package
 module AdapterExtensions#:nodoc:
-  VERSION = "0.9.5.rc1"
+  VERSION = "0.9.5"
 end

data/test/connection/postgresql/setup.sql

@@ -13,6 +13,7 @@ create table places (
 delete from places;
 
 create table truncate_test (
+  id SERIAL PRIMARY KEY,
 	x char(4)
 );
 delete from truncate_test;

data/test/integration/adapter_test.rb

@@ -6,6 +6,12 @@ class AdapterTest < Test::Unit::TestCase
   require File.dirname(__FILE__) + "/#{ENV['DB']}_tests"
   include "#{ENV['DB'].capitalize}Tests".constantize
 
+  def select_value(query)
+    value = connection.select_value(query)
+    value = Integer(value) if ENV['DB'] =~ /postgresql/
+    value
+  end
+  
   def test_add_select_into_table
     new_table_name = 'new_people'
     sql_query = 'select * from people'
@@ -19,18 +25,18 @@ class AdapterTest < Test::Unit::TestCase
       connection.execute("insert into truncate_test (x) values ('#{value}')")
     end
     
-    assert_equal "3", connection.select_value("SELECT count(*) FROM truncate_test")
+    assert_equal 3, select_value("SELECT count(*) FROM truncate_test")
     assert_nothing_raised { connection.truncate('truncate_test') }
-    assert_equal "0", connection.select_value("SELECT count(*) FROM truncate_test")
+    assert_equal 0, select_value("SELECT count(*) FROM truncate_test")
   end
    
   def test_bulk_load
     connection.truncate('people')
-    assert_equal "0", connection.select_value("SELECT count(*) FROM people")
+    assert_equal 0, select_value("SELECT count(*) FROM people")
     assert_nothing_raised do
       connection.bulk_load(File.join(File.dirname(__FILE__), 'people.txt'), 'people')
     end
-    assert_equal "3", connection.select_value("SELECT count(*) FROM people")
+    assert_equal 3, select_value("SELECT count(*) FROM people")
   end
    
   def test_bulk_load_csv
@@ -39,7 +45,7 @@ class AdapterTest < Test::Unit::TestCase
       options = {:fields => {:delimited_by => ','}}
       connection.bulk_load(File.join(File.dirname(__FILE__), 'people.csv'), 'people', options)
     end
-    assert_equal "3", connection.select_value("SELECT count(*) FROM people")
+    assert_equal 3, select_value("SELECT count(*) FROM people")
   end
   
   def test_bulk_load_with_enclosed_by
@@ -48,7 +54,7 @@ class AdapterTest < Test::Unit::TestCase
       options = {:fields => {:delimited_by => ',', :enclosed_by => '"'}}
       connection.bulk_load(File.join(File.dirname(__FILE__), 'people.csv'), 'people', options)
     end
-    assert_equal "3", connection.select_value("SELECT count(*) FROM people")
+    assert_equal 3, select_value("SELECT count(*) FROM people")
   end
   
   def test_bulk_load_with_null_string
@@ -57,21 +63,21 @@ class AdapterTest < Test::Unit::TestCase
       options = {:fields => {:delimited_by => ',', :null_string => ''}}
       connection.bulk_load(File.join(File.dirname(__FILE__), 'people.csv'), 'people', options)
     end
-    assert_equal "3", connection.select_value("SELECT count(*) FROM people")
+    assert_equal 3, select_value("SELECT count(*) FROM people")
   end
   
   def test_bulk_load_interprets_empty_strings_as_empty_strings
     connection.truncate('people')
     options = {:fields => {:delimited_by => ','}}
     connection.bulk_load(File.join(File.dirname(__FILE__), 'people_with_empties.csv'), 'people', options)
-    assert_equal "0", connection.select_value("SELECT count(*) FROM people WHERE first_name IS NULL")
+    assert_equal 0, select_value("SELECT count(*) FROM people WHERE first_name IS NULL")
   end
   
   def test_bulk_load_interprets_empty_strings_as_nulls
     connection.truncate('people')
     options = {:fields => {:delimited_by => ',', :null_string => ''}}
     connection.bulk_load(File.join(File.dirname(__FILE__), 'people_with_empties.csv'), 'people', options)
-    assert_equal "1", connection.select_value("SELECT count(*) FROM people WHERE first_name IS NULL"),
+    assert_equal 1, select_value("SELECT count(*) FROM people WHERE first_name IS NULL"),
       "NOTE: this is a known issue with MySQL - any other db should work correctly"
   end
   
@@ -108,7 +114,7 @@ class AdapterTest < Test::Unit::TestCase
     options = {:fields => {:delimited_by => ',', :enclosed_by => '"'}}
     connection.bulk_load(File.join(File.dirname(__FILE__), 'people.csv'), 'people', options)
     connection.copy_table(table_name, dest_table_name)
-    assert_equal 3, connection.select_value("SELECT count(*) FROM #{dest_table_name}").to_i
+    assert_equal 3, select_value("SELECT count(*) FROM #{dest_table_name}").to_i
   end
   
   private

data/test/integration/postgresql_tests.rb

@@ -3,4 +3,32 @@ module PostgresqlTests
     # TODO: mock connection adapter?
     assert connection.support_select_into_table?
   end
+
+  def blank_slate!
+    connection.truncate('truncate_test', 'RESTART IDENTITY')
+    assert_equal "0", connection.select_value("SELECT count(*) FROM truncate_test")
+  end
+  
+  def test_truncate_should_not_reset_identity_by_default
+    blank_slate!
+
+    connection.execute("insert into truncate_test (x) values ('a')")
+    connection.truncate('truncate_test')
+
+    connection.execute("insert into truncate_test (x) values ('a')")
+    # in this case the id should not be reset to 1
+    assert_equal "2", connection.select_value("SELECT id FROM truncate_test")
+  end
+  
+  def test_truncate_should_reset_identity_if_requested
+    blank_slate!
+
+    connection.execute("insert into truncate_test (x) values ('a')")
+    connection.truncate('truncate_test', 'RESTART IDENTITY')
+
+    connection.execute("insert into truncate_test (x) values ('a')")
+    # when using RESTART IDENTITY the id should be reset to 1
+    assert_equal "1", connection.select_value("SELECT id FROM truncate_test")
+  end
+  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adapter_extensions
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  hash: 49
+  prerelease: 
   segments: 
   - 0
   - 9
   - 5
-  - rc1
-  version: 0.9.5.rc1
+  version: 0.9.5
 platform: ruby
 authors: 
 - Anthony Eden
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-20 00:00:00 +02:00
-default_executable: 
+date: 2011-12-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -27,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 57
         segments: 
         - 0
         - 8
@@ -42,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
         - 1
@@ -57,6 +58,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
         - 1
@@ -79,7 +81,7 @@ files:
 - Gemfile
 - HOW_TO_RELEASE
 - LICENSE
-- README
+- README.md
 - Rakefile
 - adapter_extensions.gemspec
 - lib/adapter_extensions.rb
@@ -101,7 +103,6 @@ files:
 - test/integration/people_with_empties.csv
 - test/integration/postgresql_tests.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: https://github.com/activewarehouse/adapter_extensions
 licenses: []
 
@@ -115,6 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -123,6 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3
@@ -131,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: activewarehouse
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Extensions to Rails ActiveRecord adapters.

data/README

@@ -1,7 +0,0 @@
-This library provides extensions to Rails' ActiveRecord adapters.
-
-As of version 0.5, adapter_extensions has dependencies on ActiveSupport and ActiveRecord 2.1.x or higher.
-
-To use the MySQL adapter extensions with Rails 2.x, you must patch the mysql_adapter with the mysql_adapter_opt_local_infile.patch.
-
-To execute the unit tests you must first construct a adapter_extensions_unittest database.