ibm_db 3.0.4-x86-mingw32 → 3.0.5-x86-mingw32

data/test/cases/tasks/sqlite_rake_test.rb

@@ -1,193 +1,193 @@
-require 'cases/helper'
-require 'pathname'
-
-if current_adapter?(:SQLite3Adapter)
-module ActiveRecord
-  class SqliteDBCreateTest < ActiveRecord::TestCase
-    def setup
-      @database      = 'db_create.sqlite3'
-      @connection    = stub :connection
-      @configuration = {
-        'adapter'  => 'sqlite3',
-        'database' => @database
-      }
-
-      File.stubs(:exist?).returns(false)
-      ActiveRecord::Base.stubs(:connection).returns(@connection)
-      ActiveRecord::Base.stubs(:establish_connection).returns(true)
-    end
-
-    def test_db_checks_database_exists
-      File.expects(:exist?).with(@database).returns(false)
-
-      ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
-    end
-
-    def test_db_create_when_file_exists
-      File.stubs(:exist?).returns(true)
-
-      $stderr.expects(:puts).with("#{@database} already exists")
-
-      ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
-    end
-
-    def test_db_create_with_file_does_nothing
-      File.stubs(:exist?).returns(true)
-      $stderr.stubs(:puts).returns(nil)
-
-      ActiveRecord::Base.expects(:establish_connection).never
-
-      ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
-    end
-
-    def test_db_create_establishes_a_connection
-      ActiveRecord::Base.expects(:establish_connection).with(@configuration)
-
-      ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
-    end
-
-    def test_db_create_with_error_prints_message
-      ActiveRecord::Base.stubs(:establish_connection).raises(Exception)
-
-      $stderr.stubs(:puts).returns(true)
-      $stderr.expects(:puts).
-        with("Couldn't create database for #{@configuration.inspect}")
-
-      ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
-    end
-  end
-
-  class SqliteDBDropTest < ActiveRecord::TestCase
-    def setup
-      @database      = "db_create.sqlite3"
-      @path          = stub(:to_s => '/absolute/path', :absolute? => true)
-      @configuration = {
-        'adapter'  => 'sqlite3',
-        'database' => @database
-      }
-
-      Pathname.stubs(:new).returns(@path)
-      File.stubs(:join).returns('/former/relative/path')
-      FileUtils.stubs(:rm).returns(true)
-    end
-
-    def test_creates_path_from_database
-      Pathname.expects(:new).with(@database).returns(@path)
-
-      ActiveRecord::Tasks::DatabaseTasks.drop @configuration, '/rails/root'
-    end
-
-    def test_removes_file_with_absolute_path
-      File.stubs(:exist?).returns(true)
-      @path.stubs(:absolute?).returns(true)
-
-      FileUtils.expects(:rm).with('/absolute/path')
-
-      ActiveRecord::Tasks::DatabaseTasks.drop @configuration, '/rails/root'
-    end
-
-    def test_generates_absolute_path_with_given_root
-      @path.stubs(:absolute?).returns(false)
-
-      File.expects(:join).with('/rails/root', @path).
-        returns('/former/relative/path')
-
-      ActiveRecord::Tasks::DatabaseTasks.drop @configuration, '/rails/root'
-    end
-
-    def test_removes_file_with_relative_path
-      File.stubs(:exist?).returns(true)
-      @path.stubs(:absolute?).returns(false)
-
-      FileUtils.expects(:rm).with('/former/relative/path')
-
-      ActiveRecord::Tasks::DatabaseTasks.drop @configuration, '/rails/root'
-    end
-  end
-
-  class SqliteDBCharsetTest < ActiveRecord::TestCase
-    def setup
-      @database      = 'db_create.sqlite3'
-      @connection    = stub :connection
-      @configuration = {
-        'adapter'  => 'sqlite3',
-        'database' => @database
-      }
-
-      File.stubs(:exist?).returns(false)
-      ActiveRecord::Base.stubs(:connection).returns(@connection)
-      ActiveRecord::Base.stubs(:establish_connection).returns(true)
-    end
-
-    def test_db_retrieves_charset
-      @connection.expects(:encoding)
-      ActiveRecord::Tasks::DatabaseTasks.charset @configuration, '/rails/root'
-    end
-  end
-
-  class SqliteDBCollationTest < ActiveRecord::TestCase
-    def setup
-      @database      = 'db_create.sqlite3'
-      @connection    = stub :connection
-      @configuration = {
-        'adapter'  => 'sqlite3',
-        'database' => @database
-      }
-
-      File.stubs(:exist?).returns(false)
-      ActiveRecord::Base.stubs(:connection).returns(@connection)
-      ActiveRecord::Base.stubs(:establish_connection).returns(true)
-    end
-
-    def test_db_retrieves_collation
-      assert_raise NoMethodError do
-        ActiveRecord::Tasks::DatabaseTasks.collation @configuration, '/rails/root'
-      end
-    end
-  end
-
-  class SqliteStructureDumpTest < ActiveRecord::TestCase
-    def setup
-      @database      = "db_create.sqlite3"
-      @configuration = {
-        'adapter'  => 'sqlite3',
-        'database' => @database
-      }
-    end
-
-    def test_structure_dump
-      dbfile   = @database
-      filename = "awesome-file.sql"
-
-      ActiveRecord::Tasks::DatabaseTasks.structure_dump @configuration, filename, '/rails/root'
-      assert File.exist?(dbfile)
-      assert File.exist?(filename)
-    ensure
-      FileUtils.rm_f(filename)
-      FileUtils.rm_f(dbfile)
-    end
-  end
-
-  class SqliteStructureLoadTest < ActiveRecord::TestCase
-    def setup
-      @database      = "db_create.sqlite3"
-      @configuration = {
-        'adapter'  => 'sqlite3',
-        'database' => @database
-      }
-    end
-
-    def test_structure_load
-      dbfile   = @database
-      filename = "awesome-file.sql"
-
-      open(filename, 'w') { |f| f.puts("select datetime('now', 'localtime');") }
-      ActiveRecord::Tasks::DatabaseTasks.structure_load @configuration, filename, '/rails/root'
-      assert File.exist?(dbfile)
-    ensure
-      FileUtils.rm_f(filename)
-      FileUtils.rm_f(dbfile)
-    end
-  end
-end
-end
+require 'cases/helper'
+require 'pathname'
+
+if current_adapter?(:SQLite3Adapter)
+module ActiveRecord
+  class SqliteDBCreateTest < ActiveRecord::TestCase
+    def setup
+      @database      = 'db_create.sqlite3'
+      @connection    = stub :connection
+      @configuration = {
+        'adapter'  => 'sqlite3',
+        'database' => @database
+      }
+
+      File.stubs(:exist?).returns(false)
+      ActiveRecord::Base.stubs(:connection).returns(@connection)
+      ActiveRecord::Base.stubs(:establish_connection).returns(true)
+    end
+
+    def test_db_checks_database_exists
+      File.expects(:exist?).with(@database).returns(false)
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
+    end
+
+    def test_db_create_when_file_exists
+      File.stubs(:exist?).returns(true)
+
+      $stderr.expects(:puts).with("#{@database} already exists")
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
+    end
+
+    def test_db_create_with_file_does_nothing
+      File.stubs(:exist?).returns(true)
+      $stderr.stubs(:puts).returns(nil)
+
+      ActiveRecord::Base.expects(:establish_connection).never
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
+    end
+
+    def test_db_create_establishes_a_connection
+      ActiveRecord::Base.expects(:establish_connection).with(@configuration)
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
+    end
+
+    def test_db_create_with_error_prints_message
+      ActiveRecord::Base.stubs(:establish_connection).raises(Exception)
+
+      $stderr.stubs(:puts).returns(true)
+      $stderr.expects(:puts).
+        with("Couldn't create database for #{@configuration.inspect}")
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
+    end
+  end
+
+  class SqliteDBDropTest < ActiveRecord::TestCase
+    def setup
+      @database      = "db_create.sqlite3"
+      @path          = stub(:to_s => '/absolute/path', :absolute? => true)
+      @configuration = {
+        'adapter'  => 'sqlite3',
+        'database' => @database
+      }
+
+      Pathname.stubs(:new).returns(@path)
+      File.stubs(:join).returns('/former/relative/path')
+      FileUtils.stubs(:rm).returns(true)
+    end
+
+    def test_creates_path_from_database
+      Pathname.expects(:new).with(@database).returns(@path)
+
+      ActiveRecord::Tasks::DatabaseTasks.drop @configuration, '/rails/root'
+    end
+
+    def test_removes_file_with_absolute_path
+      File.stubs(:exist?).returns(true)
+      @path.stubs(:absolute?).returns(true)
+
+      FileUtils.expects(:rm).with('/absolute/path')
+
+      ActiveRecord::Tasks::DatabaseTasks.drop @configuration, '/rails/root'
+    end
+
+    def test_generates_absolute_path_with_given_root
+      @path.stubs(:absolute?).returns(false)
+
+      File.expects(:join).with('/rails/root', @path).
+        returns('/former/relative/path')
+
+      ActiveRecord::Tasks::DatabaseTasks.drop @configuration, '/rails/root'
+    end
+
+    def test_removes_file_with_relative_path
+      File.stubs(:exist?).returns(true)
+      @path.stubs(:absolute?).returns(false)
+
+      FileUtils.expects(:rm).with('/former/relative/path')
+
+      ActiveRecord::Tasks::DatabaseTasks.drop @configuration, '/rails/root'
+    end
+  end
+
+  class SqliteDBCharsetTest < ActiveRecord::TestCase
+    def setup
+      @database      = 'db_create.sqlite3'
+      @connection    = stub :connection
+      @configuration = {
+        'adapter'  => 'sqlite3',
+        'database' => @database
+      }
+
+      File.stubs(:exist?).returns(false)
+      ActiveRecord::Base.stubs(:connection).returns(@connection)
+      ActiveRecord::Base.stubs(:establish_connection).returns(true)
+    end
+
+    def test_db_retrieves_charset
+      @connection.expects(:encoding)
+      ActiveRecord::Tasks::DatabaseTasks.charset @configuration, '/rails/root'
+    end
+  end
+
+  class SqliteDBCollationTest < ActiveRecord::TestCase
+    def setup
+      @database      = 'db_create.sqlite3'
+      @connection    = stub :connection
+      @configuration = {
+        'adapter'  => 'sqlite3',
+        'database' => @database
+      }
+
+      File.stubs(:exist?).returns(false)
+      ActiveRecord::Base.stubs(:connection).returns(@connection)
+      ActiveRecord::Base.stubs(:establish_connection).returns(true)
+    end
+
+    def test_db_retrieves_collation
+      assert_raise NoMethodError do
+        ActiveRecord::Tasks::DatabaseTasks.collation @configuration, '/rails/root'
+      end
+    end
+  end
+
+  class SqliteStructureDumpTest < ActiveRecord::TestCase
+    def setup
+      @database      = "db_create.sqlite3"
+      @configuration = {
+        'adapter'  => 'sqlite3',
+        'database' => @database
+      }
+    end
+
+    def test_structure_dump
+      dbfile   = @database
+      filename = "awesome-file.sql"
+
+      ActiveRecord::Tasks::DatabaseTasks.structure_dump @configuration, filename, '/rails/root'
+      assert File.exist?(dbfile)
+      assert File.exist?(filename)
+    ensure
+      FileUtils.rm_f(filename)
+      FileUtils.rm_f(dbfile)
+    end
+  end
+
+  class SqliteStructureLoadTest < ActiveRecord::TestCase
+    def setup
+      @database      = "db_create.sqlite3"
+      @configuration = {
+        'adapter'  => 'sqlite3',
+        'database' => @database
+      }
+    end
+
+    def test_structure_load
+      dbfile   = @database
+      filename = "awesome-file.sql"
+
+      open(filename, 'w') { |f| f.puts("select datetime('now', 'localtime');") }
+      ActiveRecord::Tasks::DatabaseTasks.structure_load @configuration, filename, '/rails/root'
+      assert File.exist?(dbfile)
+    ensure
+      FileUtils.rm_f(filename)
+      FileUtils.rm_f(dbfile)
+    end
+  end
+end
+end

data/test/cases/test_case.rb

@@ -1,123 +1,123 @@
-require 'active_support/test_case'
-
-module ActiveRecord
-  # = Active Record Test Case
-  #
-  # Defines some test assertions to test against SQL queries.
-  class TestCase < ActiveSupport::TestCase #:nodoc:
-    def teardown
-      SQLCounter.clear_log
-    end
-
-    def assert_date_from_db(expected, actual, message = nil)
-      assert_equal expected.to_s, actual.to_s, message
-    end
-
-    def capture(stream)
-      stream = stream.to_s
-      captured_stream = Tempfile.new(stream)
-      stream_io = eval("$#{stream}")
-      origin_stream = stream_io.dup
-      stream_io.reopen(captured_stream)
-
-      yield
-
-      stream_io.rewind
-      return captured_stream.read
-    ensure
-      captured_stream.close
-      captured_stream.unlink
-      stream_io.reopen(origin_stream)
-    end
-
-    def capture_sql
-      SQLCounter.clear_log
-      yield
-      SQLCounter.log_all.dup
-    end
-
-    def assert_sql(*patterns_to_match)
-      capture_sql { yield }
-    ensure
-      failed_patterns = []
-      patterns_to_match.each do |pattern|
-        failed_patterns << pattern unless SQLCounter.log_all.any?{ |sql| pattern === sql }
-      end
-      assert failed_patterns.empty?, "Query pattern(s) #{failed_patterns.map{ |p| p.inspect }.join(', ')} not found.#{SQLCounter.log.size == 0 ? '' : "\nQueries:\n#{SQLCounter.log.join("\n")}"}"
-    end
-
-    def assert_queries(num = 1, options = {})
-      ignore_none = options.fetch(:ignore_none) { num == :any }
-      SQLCounter.clear_log
-      x = yield
-      the_log = ignore_none ? SQLCounter.log_all : SQLCounter.log
-      if num == :any
-        assert_operator the_log.size, :>=, 1, "1 or more queries expected, but none were executed."
-      else
-        mesg = "#{the_log.size} instead of #{num} queries were executed.#{the_log.size == 0 ? '' : "\nQueries:\n#{the_log.join("\n")}"}"
-        assert_equal num, the_log.size, mesg
-      end
-      x
-    end
-
-    def assert_no_queries(options = {}, &block)
-      options.reverse_merge! ignore_none: true
-      assert_queries(0, options, &block)
-    end
-
-    def assert_column(model, column_name, msg=nil)
-      assert has_column?(model, column_name), msg
-    end
-
-    def assert_no_column(model, column_name, msg=nil)
-      assert_not has_column?(model, column_name), msg
-    end
-
-    def has_column?(model, column_name)
-      model.reset_column_information
-      model.column_names.include?(column_name.to_s)
-    end
-  end
-
-  class SQLCounter
-    class << self
-      attr_accessor :ignored_sql, :log, :log_all
-      def clear_log; self.log = []; self.log_all = []; end
-    end
-
-    self.clear_log
-
-    self.ignored_sql = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /^SHOW max_identifier_length/, /^BEGIN/, /^COMMIT/]
-
-    # FIXME: this needs to be refactored so specific database can add their own
-    # ignored SQL, or better yet, use a different notification for the queries
-    # instead examining the SQL content.
-    oracle_ignored     = [/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO/, /^\s*select .* from all_triggers/im, /^\s*select .* from all_constraints/im, /^\s*select .* from all_tab_cols/im]
-    mysql_ignored      = [/^SHOW TABLES/i, /^SHOW FULL FIELDS/, /^SHOW CREATE TABLE /i, /^SHOW VARIABLES /]
-    postgresql_ignored = [/^\s*select\b.*\bfrom\b.*pg_namespace\b/im, /^\s*select tablename\b.*from pg_tables\b/im, /^\s*select\b.*\battname\b.*\bfrom\b.*\bpg_attribute\b/im, /^SHOW search_path/i]
-    sqlite3_ignored =    [/^\s*SELECT name\b.*\bFROM sqlite_master/im]
-
-    [oracle_ignored, mysql_ignored, postgresql_ignored, sqlite3_ignored].each do |db_ignored_sql|
-      ignored_sql.concat db_ignored_sql
-    end
-
-    attr_reader :ignore
-
-    def initialize(ignore = Regexp.union(self.class.ignored_sql))
-      @ignore = ignore
-    end
-
-    def call(name, start, finish, message_id, values)
-      sql = values[:sql]
-
-      # FIXME: this seems bad. we should probably have a better way to indicate
-      # the query was cached
-      return if 'CACHE' == values[:name]
-
-      self.class.log_all << sql
-      self.class.log << sql unless ignore =~ sql
-    end
-  end
-
-  ActiveSupport::Notifications.subscribe('sql.active_record', SQLCounter.new)
-end
+require 'active_support/test_case'
+
+module ActiveRecord
+  # = Active Record Test Case
+  #
+  # Defines some test assertions to test against SQL queries.
+  class TestCase < ActiveSupport::TestCase #:nodoc:
+    def teardown
+      SQLCounter.clear_log
+    end
+
+    def assert_date_from_db(expected, actual, message = nil)
+      assert_equal expected.to_s, actual.to_s, message
+    end
+
+    def capture(stream)
+      stream = stream.to_s
+      captured_stream = Tempfile.new(stream)
+      stream_io = eval("$#{stream}")
+      origin_stream = stream_io.dup
+      stream_io.reopen(captured_stream)
+
+      yield
+
+      stream_io.rewind
+      return captured_stream.read
+    ensure
+      captured_stream.close
+      captured_stream.unlink
+      stream_io.reopen(origin_stream)
+    end
+
+    def capture_sql
+      SQLCounter.clear_log
+      yield
+      SQLCounter.log_all.dup
+    end
+
+    def assert_sql(*patterns_to_match)
+      capture_sql { yield }
+    ensure
+      failed_patterns = []
+      patterns_to_match.each do |pattern|
+        failed_patterns << pattern unless SQLCounter.log_all.any?{ |sql| pattern === sql }
+      end
+      assert failed_patterns.empty?, "Query pattern(s) #{failed_patterns.map{ |p| p.inspect }.join(', ')} not found.#{SQLCounter.log.size == 0 ? '' : "\nQueries:\n#{SQLCounter.log.join("\n")}"}"
+    end
+
+    def assert_queries(num = 1, options = {})
+      ignore_none = options.fetch(:ignore_none) { num == :any }
+      SQLCounter.clear_log
+      x = yield
+      the_log = ignore_none ? SQLCounter.log_all : SQLCounter.log
+      if num == :any
+        assert_operator the_log.size, :>=, 1, "1 or more queries expected, but none were executed."
+      else
+        mesg = "#{the_log.size} instead of #{num} queries were executed.#{the_log.size == 0 ? '' : "\nQueries:\n#{the_log.join("\n")}"}"
+        assert_equal num, the_log.size, mesg
+      end
+      x
+    end
+
+    def assert_no_queries(options = {}, &block)
+      options.reverse_merge! ignore_none: true
+      assert_queries(0, options, &block)
+    end
+
+    def assert_column(model, column_name, msg=nil)
+      assert has_column?(model, column_name), msg
+    end
+
+    def assert_no_column(model, column_name, msg=nil)
+      assert_not has_column?(model, column_name), msg
+    end
+
+    def has_column?(model, column_name)
+      model.reset_column_information
+      model.column_names.include?(column_name.to_s)
+    end
+  end
+
+  class SQLCounter
+    class << self
+      attr_accessor :ignored_sql, :log, :log_all
+      def clear_log; self.log = []; self.log_all = []; end
+    end
+
+    self.clear_log
+
+    self.ignored_sql = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /^SHOW max_identifier_length/, /^BEGIN/, /^COMMIT/]
+
+    # FIXME: this needs to be refactored so specific database can add their own
+    # ignored SQL, or better yet, use a different notification for the queries
+    # instead examining the SQL content.
+    oracle_ignored     = [/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO/, /^\s*select .* from all_triggers/im, /^\s*select .* from all_constraints/im, /^\s*select .* from all_tab_cols/im]
+    mysql_ignored      = [/^SHOW TABLES/i, /^SHOW FULL FIELDS/, /^SHOW CREATE TABLE /i, /^SHOW VARIABLES /]
+    postgresql_ignored = [/^\s*select\b.*\bfrom\b.*pg_namespace\b/im, /^\s*select tablename\b.*from pg_tables\b/im, /^\s*select\b.*\battname\b.*\bfrom\b.*\bpg_attribute\b/im, /^SHOW search_path/i]
+    sqlite3_ignored =    [/^\s*SELECT name\b.*\bFROM sqlite_master/im]
+
+    [oracle_ignored, mysql_ignored, postgresql_ignored, sqlite3_ignored].each do |db_ignored_sql|
+      ignored_sql.concat db_ignored_sql
+    end
+
+    attr_reader :ignore
+
+    def initialize(ignore = Regexp.union(self.class.ignored_sql))
+      @ignore = ignore
+    end
+
+    def call(name, start, finish, message_id, values)
+      sql = values[:sql]
+
+      # FIXME: this seems bad. we should probably have a better way to indicate
+      # the query was cached
+      return if 'CACHE' == values[:name]
+
+      self.class.log_all << sql
+      self.class.log << sql unless ignore =~ sql
+    end
+  end
+
+  ActiveSupport::Notifications.subscribe('sql.active_record', SQLCounter.new)
+end