ext/win32ole/win32ole.c (add_event_call_back): should not

 delete event handler when the event name is not entried.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 32 insertions, 0 deletions

diff --git a/test/win32ole/test_nil2vtempty.rb b/test/win32ole/test_nil2vtempty.rb
new file mode 100644
index 0000000000..2576415a8d
--- /dev/null
+++ b/test/win32ole/test_nil2vtempty.rb
@@ -0,0 +1,32 @@
+# This is test script to check that WIN32OLE should convert nil to VT_EMPTY in second try.
+# [ruby-talk:137054]
+begin
+  require 'win32ole'
+rescue LoadError
+end
+
+require 'test/unit'
+if defined?(WIN32OLE)
+  class TestNIL2VT_EMPTY < Test::Unit::TestCase
+    def setup
+      fs = WIN32OLE.new('Scripting.FileSystemObject')
+      @path = fs.GetFolder(".").path
+    end
+    def test_openSchema
+      con = nil
+      begin
+        con = WIN32OLE.new('ADODB.Connection')
+        con.connectionString = "Provider=MSDASQL;Extended Properties="
+        con.connectionString +="\"DRIVER={Microsoft Text Driver (*.txt; *.csv)};DBQ=#{@path}\""
+        con.open
+      rescue
+        con = nil
+      end
+      if con
+        rs = con.openSchema(4, [nil,nil,"DUMMY", "TABLE"])
+        assert(rs)
+        assert_equal("_Recordset", rs.ole_type.name)
+      end
+    end
+  end
+end