ibm_db 1.5.0-mswin32 → 2.0.0-mswin32

data/test/cases/calculations_test.rb

@@ -168,7 +168,11 @@ class CalculationsTest < ActiveRecord::TestCase
   end
 
   def test_should_group_by_association_with_non_numeric_foreign_key
-    ActiveRecord::Base.connection.expects(:select_all).returns([{"count_all" => 1, "firm_id" => "ABC"}])
+    if( ActiveRecord::Base.connection.respond_to?(:pstmt_support_on) && ActiveRecord::Base.connection.pstmt_support_on == true )
+      ActiveRecord::Base.connection.expects(:prepared_select).returns([{"count_all" => 1, "firm_id" => "ABC"}])
+    else
+      ActiveRecord::Base.connection.expects(:select_all).returns([{"count_all" => 1, "firm_id" => "ABC"}])
+    end
 
     firm = mock()
     firm.expects(:id).returns("ABC")

data/test/cases/helper.rb

@@ -0,0 +1,75 @@
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
+$:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib')
+
+require 'config'
+
+require 'rubygems'
+require 'test/unit'
+require 'stringio'
+
+require 'active_record'
+require 'active_record/test_case'
+require 'active_record/fixtures'
+require 'connection'
+
+require 'cases/repair_helper'
+
+# Show backtraces for deprecated behavior for quicker cleanup.
+ActiveSupport::Deprecation.debug = true
+
+# Quote "type" if it's a reserved word for the current connection.
+QUOTED_TYPE = ActiveRecord::Base.connection.quote_column_name('type')
+
+def current_adapter?(*types)
+  types.any? do |type|
+    ActiveRecord::ConnectionAdapters.const_defined?(type) &&
+      ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters.const_get(type))
+  end
+end
+
+ActiveRecord::Base.connection.class.class_eval do
+  IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /SHOW FIELDS/]
+
+  def execute_with_query_record(sql, name = nil, &block)
+    $queries_executed ||= []
+    $queries_executed << sql unless IGNORED_SQL.any? { |r| sql =~ r }
+    execute_without_query_record(sql, name, &block)
+  end
+
+  def execute_prepared_stmt_with_query_record(pstmt, param_array = nil)
+    $queries_executed ||= []
+    $queries_executed << "#{@prepared_sql} + #{param_array}" unless IGNORED_SQL.any? { |r| @prepared_sql =~ r }
+    execute_prepared_stmt_without_query_record(pstmt, param_array)
+  end
+
+  alias_method_chain :execute, :query_record
+  alias_method_chain :execute_prepared_stmt, :query_record
+end
+
+# Make with_scope public for tests
+class << ActiveRecord::Base
+  public :with_scope, :with_exclusive_scope
+end
+
+unless ENV['FIXTURE_DEBUG']
+  module ActiveRecord::TestFixtures::ClassMethods
+    def try_to_load_dependency_with_silence(*args)
+      ActiveRecord::Base.logger.silence { try_to_load_dependency_without_silence(*args)}
+    end
+
+    alias_method_chain :try_to_load_dependency, :silence
+  end
+end
+
+class ActiveSupport::TestCase
+  include ActiveRecord::TestFixtures
+  include ActiveRecord::Testing::RepairHelper
+
+  self.fixture_path = FIXTURES_ROOT
+  self.use_instantiated_fixtures  = false
+  self.use_transactional_fixtures = true
+
+  def create_fixtures(*table_names, &block)
+    Fixtures.create_fixtures(ActiveSupport::TestCase.fixture_path, table_names, {}, &block)
+  end
+end

data/test/connections/native_ibm_db/connection.rb

@@ -7,32 +7,34 @@ ActiveRecord::Base.logger.level = Logger::FATAL
 
 ActiveRecord::Base.configurations = {
   'arunit' => {
-    :adapter     => 'ibm_db',
-    :username    => 'db2user',
-    :password    => 'secret', 
-    :host        => 'bilbao',
-    :port        => '50000',
-    :schema      => 'rails123',
-    :account     => 'tester',
-    :app_user    => 'tester_11',
-    :application => 'rails_tests',
-    :workstation => 'auckland',
-    :start_id    => 100,
-    :database    => 'ARUNIT'
+    :adapter       => 'ibm_db',
+    :username      => 'db2user',
+    :password      => 'secret', 
+    :host          => 'bilbao',
+    :port          => '50000',
+    :schema        => 'rails123',
+    :account       => 'tester',
+    :app_user      => 'tester_11',
+    :application   => 'rails_tests',
+    :workstation   => 'auckland',
+    :start_id      => 100,
+    :database      => 'ARUNIT',
+    :parameterized => false
   },
   'arunit2' => {
-    :adapter     => 'ibm_db',
-    :username    => 'db2user',
-    :password    => 'secret',
-    :host        => 'bilbao',
-    :port        => '50000',
-    :schema      => 'rails123',
-    :account     => 'tester',
-    :app_user    => 'tester_11',
-    :application => 'rails_tests',
-    :workstation => 'auckland',
-    :start_id    => 100,
-    :database    => 'ARUNIT2'
+    :adapter       => 'ibm_db',
+    :username      => 'db2user',
+    :password      => 'secret',
+    :host          => 'bilbao',
+    :port          => '50000',
+    :schema        => 'rails123',
+    :account       => 'tester',
+    :app_user      => 'tester_11',
+    :application   => 'rails_tests',
+    :workstation   => 'auckland',
+    :start_id      => 100,
+    :database      => 'ARUNIT2',
+    :parameterized => false
   }
 }
 

data/test/schema/schema.rb

@@ -23,6 +23,7 @@ ActiveRecord::Schema.define do
   # unless the ordering matters.  In which case, define them below
   create_table :accounts, :force => true do |t|
     t.integer :firm_id
+    t.string  :firm_name
     t.integer :credit_limit
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ibm_db
 version: !ruby/object:Gem::Version 
-  version: 1.5.0
+  version: 2.0.0
 platform: mswin32
 authors: 
 - IBM
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-05 00:00:00 +05:30
+date: 2010-01-21 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,17 +37,18 @@ files:
 - ext/extconf.rb
 - ext/ibm_db.c
 - ext/Makefile.nt32
-- ext/mkmf.log
 - ext/ruby_ibm_db.h
 - ext/ruby_ibm_db_cli.c
 - ext/ruby_ibm_db_cli.h
 - init.rb
 - lib/active_record/connection_adapters/ibm_db_adapter.rb
+- lib/active_record/connection_adapters/ibm_db_pstmt.rb
 - lib/active_record/vendor/db2-i5-zOS.yaml
 - lib/IBM_DB.rb
 - lib/mswin32/ibm_db.so
 - LICENSE
 - MANIFEST
+- ParameterizedQueries README
 - README
 - test/cases/adapter_test.rb
 - test/cases/associations/cascaded_eager_loading_test.rb
@@ -60,6 +61,7 @@ files:
 - test/cases/calculations_test.rb
 - test/cases/finder_test.rb
 - test/cases/fixtures_test.rb
+- test/cases/helper.rb
 - test/cases/migration_test.rb
 - test/cases/schema_dumper_test.rb
 - test/cases/validations_test.rb

data/ext/mkmf.log

@@ -1,45 +0,0 @@
-have_library: checking for SQLConnect() in db2cli.lib... -------------------- yes
-
-"cl -nologo -Feconftest -I. -Ic:/ruby/lib/ruby/1.8/i386-mswin32 -I. -Ic:/ruby/lib/ruby/1.8/i386-mswin32 -IC:/Progra~1/IBM/SQLLIB/include  -MD -Zi -O2b2xg- -G6 conftest.c   msvcrt-ruby18-static.lib db2cli.lib  oldnames.lib user32.lib advapi32.lib ws2_32.lib   -link    -libpath:"." -libpath:"c:/ruby/lib" -libpath:"C:/Progra~1/IBM/SQLLIB/lib" -stack:0x2000000"
-cl : Command line warning D9035 : option 'Og-' has been deprecated and will be removed in a future release
-cl : Command line warning D9002 : ignoring unknown option '-G6'
-conftest.c
-conftest.c(7) : error C2065: 'SQLConnect' : undeclared identifier
-checked program was:
-/* begin */
-1: #define WIN32_LEAN_AND_MEAN
-2: #include <winsock2.h>
-3: #include <windows.h>
-4: 
-5: /*top*/
-6: int main() { return 0; }
-7: int t() { void ((*volatile p)()); p = (void ((*)()))SQLConnect; return 0; }
-/* end */
-
-"cl -nologo -Feconftest -I. -Ic:/ruby/lib/ruby/1.8/i386-mswin32 -I. -Ic:/ruby/lib/ruby/1.8/i386-mswin32 -IC:/Progra~1/IBM/SQLLIB/include  -MD -Zi -O2b2xg- -G6 conftest.c   msvcrt-ruby18-static.lib db2cli.lib  oldnames.lib user32.lib advapi32.lib ws2_32.lib   -link    -libpath:"." -libpath:"c:/ruby/lib" -libpath:"C:/Progra~1/IBM/SQLLIB/lib" -stack:0x2000000"
-cl : Command line warning D9035 : option 'Og-' has been deprecated and will be removed in a future release
-cl : Command line warning D9002 : ignoring unknown option '-G6'
-conftest.c
-checked program was:
-/* begin */
-1: /*top*/
-2: int main() { return 0; }
-3: int t() { SQLConnect(); return 0; }
-/* end */
-
---------------------
-
-have_header: checking for gil_release_version... -------------------- no
-
-"cl -nologo -E -I. -Ic:/ruby/lib/ruby/1.8/i386-mswin32 -I. -IC:/Progra~1/IBM/SQLLIB/include  -MD -Zi -O2b2xg- -G6  conftest.c -P"
-cl : Command line warning D9035 : option 'Og-' has been deprecated and will be removed in a future release
-cl : Command line warning D9002 : ignoring unknown option '-G6'
-conftest.c
-conftest.c(1) : fatal error C1083: Cannot open include file: 'gil_release_version': No such file or directory
-checked program was:
-/* begin */
-1: #include <gil_release_version>
-/* end */
-
---------------------
-