ffi-sybase 0.0.1 → 0.0.2

data/TODO

@@ -1,10 +1,10 @@
 soon:
 
-  - Sybase::Client wraps Context/Connection
   - simple specs
-  
+  - improve result handling
+
 maybe:
-  
+
   - Async / EM
-  
+
 

data/examples/{sp_who.rb → low_level.rb}

@@ -1,20 +1,23 @@
 $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
-require 'pp'
 require 'ffi-sybase'
-
+require "pp"
 unless ARGV.size == 3
-  abort("USAGE: #{$PROGRAM_NAME} <db> <user> <pass>")
+  abort("USAGE: #{$PROGRAM_NAME} <db1,db2> <user> <pass>")
 end
 
-db, user, pass = *ARGV
+dbs, user, pass = *ARGV
 
 Sybase::Context.new do |ctx|
   ctx.callbacks.library { |message| puts "library : #{message}"  }
   ctx.callbacks.client  { |message| puts "client  : #{message}"  }
   ctx.callbacks.server  { |message| puts "server  : #{message}"  }
 
-  Sybase::Connection.new(ctx, :username => user, :password => pass) do |conn|
-    conn.connect db
-    pp Sybase::Command.new(conn, "sp_who").execute
+  connections = []
+  dbs.split(',').each do |db|
+    connections << Sybase::Connection.new(ctx, :username => user, :password => pass).connect(db)
+  end
+  
+  connections.each do |conn|
+    p Sybase::Command.new(conn, "sp_who").execute.size
   end
 end

data/examples/simple.rb

@@ -0,0 +1,13 @@
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+require 'ffi-sybase'
+require "pp"
+
+unless ARGV.size == 3
+  abort("USAGE: #{$PROGRAM_NAME} <db> <user> <pass>")
+end
+
+db, user, pass = *ARGV
+
+Sybase::Client.new(db, :username => user, :password => pass) do |client|
+  pp client.execute "sp_who"
+end

data/lib/ffi-sybase.rb

@@ -18,3 +18,4 @@ require "sybase/lib"
 require "sybase/context"
 require "sybase/connection"
 require "sybase/command"
+require "sybase/client"

data/lib/sybase/client.rb

@@ -0,0 +1,116 @@
+module Sybase
+  class Client
+
+    attr_reader :context, :connection, :messages
+
+    #
+    # Create a new client for the given database name
+    #
+
+    def initialize(db, opts = {})
+      @context = Context.new
+
+      @messages = Messages.new # TODO: listener?
+      @context.callbacks.library { |msg| @messages.on_message :library, msg }
+      @context.callbacks.client  { |msg| @messages.on_message :client,  msg }
+      @context.callbacks.server  { |msg| @messages.on_message :server,  msg }
+
+
+      @connection = Connection.new(@context,
+        :username => opts.fetch(:username) { raise ArgumentError, "no :username given" },
+        :password => opts.fetch(:password) { raise ArgumentError, "no :password given" },
+        :appname  => opts.fetch(:appname)  { "#{self.class} #{RUBY_DESCRIPTION}"       },
+        :hostname => opts.fetch(:hostname) { Socket.gethostname }
+      )
+
+      @connection.connect db.to_s
+
+      if block_given?
+        begin
+          yield self
+        ensure
+          close
+        end
+      end
+    end
+
+    def execute(sql)
+      $stderr.puts "executing: #{sql.inspect}" if $DEBUG
+      build_result { |res| res.affected, res.data = Command.new(@connection, sql).execute }
+    end
+
+    def close
+      @connection.close if @connection
+      @context.exit
+    end
+
+    private
+
+    def build_result
+      res = ResultBuilder.new
+      @messages.reset!
+
+      res.start
+      begin
+        yield res
+      ensure
+        res.stop
+        res.messages = @messages.messages
+      end
+
+      res
+    end
+
+    class ResultBuilder
+      attr_accessor :messages, :affected, :data
+
+      def start
+        @started_at = Time.now
+      end
+
+      def stop
+        @elapsed = Time.now - @started_at
+      end
+
+      def <<(res)
+        (@results ||= []) << res
+      end
+
+      def result_set
+
+      end
+    end
+
+    class Messages
+      def initialize
+        # TODO: order is important
+        @messages = Hash.new { |hash, key| hash[key] = [] }
+      end
+
+      def any?
+        @messages.any?
+      end
+
+      def on_message(type, msg)
+        @messages[type] << msg.to_s
+      end
+
+      def messages_for(type)
+        @messages[type]
+      end
+
+      def messages
+        @messages.values.flatten
+      end
+
+      def reset!
+        @messages.clear
+      end
+
+      def to_s
+        messages.join("\n")
+      end
+
+    end # Messages
+  end # Client
+end # Sybase

data/lib/sybase/command.rb

@@ -37,8 +37,14 @@ module Sybase
       Lib.check Lib.ct_send(to_ptr), "ct_send failed"
     end
 
-    def cancel
-      Lib.ct_cancel(nil, to_ptr, CS_CANCEL_CURRENT)
+    CANCELS = {
+      :current => CS_CANCEL_CURRENT,
+      :all     => CS_CANCEL_CURRENT
+    }
+
+    def cancel(type = :current)
+      code = CANCELS.fetch(type) { raise ArgumentError, "unknown type: #{type.inspect}, expected #{CANCELS.keys.inspect}" }
+      Lib.ct_cancel(nil, to_ptr, code)
     end
 
     COMMAND_RESULTS = {
@@ -54,9 +60,7 @@ module Sybase
 
     def results
       intptr = FFI::MemoryPointer.new(:int)
-
-      state = :initial
-
+      rows_affected = -1
       returned = []
 
       while successful? intptr
@@ -64,11 +68,12 @@ module Sybase
         restype = COMMAND_RESULTS[restype] || restype
 
         case restype
-        when :succeed, # no row - e.g. insert/update
-             :done     # results completely processed
-          returned << Result.new(restype, nil, result_info(CS_ROW_COUNT), result_info(CS_TRANS_STATE))
+        when :done # results completely processed
+          rows_affected = result_info(CS_ROW_COUNT)
+        when :succeed
+           # no row - e.g. insert/update
         when :fail
-          returned << Result.new(restype, nil, result_info(CS_ROW_COUNT), result_info(CS_TRANS_STATE))
+          raise Error, "ct_results failed (#{restype.inspect})"
         when :row,
              :cursor,
              :param,
@@ -76,26 +81,17 @@ module Sybase
              :status
 
           columns, rows = fetch_data
-          returned << Result.new(restype, :columns => columns, :rows => rows)
+          returned << {:columns => columns, :rows => rows}
         else
-          returned << Result.new(restype, nil, result_info(CS_ROW_COUNT), result_info(CS_TRANS_STATE))
+          raise Error, "unknown result (#{restype.inspect})"
         end
 
         # check context timeout?
       end
 
-      returned
+      [rows_affected, returned]
     end
 
-    class Result
-      def initialize(type, data, row_count = nil, transaction_state = nil)
-        @type              = type
-        @data              = data
-        @row_count         = row_count
-        @transaction_state = transaction_state
-      end
-    end # Result
-
     def successful?(intptr)
       @return_code = Lib.ct_results(to_ptr, intptr)
       @return_code == CS_SUCCEED

data/lib/sybase/connection.rb

@@ -21,10 +21,6 @@ module Sybase
         self[key] = value
       end
 
-      unless opts.has_key?(:hostname)
-        self[:hostname] = Socket.gethostname
-      end
-
       if block_given?
         begin
           yield self
@@ -65,39 +61,11 @@ module Sybase
       end
     end
 
-    def property_type_for(key)
-      PROPERTIES.fetch(key) { |key|
-        raise ArgumentError, "invalid option: #{key.inspect}, expected one of #{PROPERTIES.keys.inspect}"
-      }
-    end
-
-    def username=(user)
-      set_string CS_USERNAME, user
-    end
-
-    def username
-      get_string CS_USERNAME
-    end
-
-    def password=(password)
-      set_string CS_PASSWORD, password
-    end
-
-    def password
-      get_string CS_PASSWORD
-    end
-
-    def appname=(name)
-      set_string CS_APPNAME, name
-    end
-
-    def appname
-      get_string CS_APPNAME, name
-    end
-
     def connect(server)
       server = server.to_s
       Lib.check Lib.ct_connect(@ptr, server,  server.bytesize), "connect(#{server.inspect}) failed"
+
+      self
     end
 
     def to_ptr
@@ -106,16 +74,22 @@ module Sybase
 
     private
 
+    def property_type_for(key)
+      PROPERTIES.fetch(key) {
+        raise ArgumentError, "invalid option: #{key.inspect}, expected one of #{PROPERTIES.keys.inspect}"
+      }
+    end
+
     def set_string_property(property, string)
       Lib.check Lib.ct_con_props(@ptr, CS_SET, property, string.to_s, CS_NULLTERM, nil), "ct_con_prop(#{property} => #{string.inspect}) failed"
     end
 
     def get_string_property(property)
-      FFI::MemoryPointer.new(:string) { |ptr| get_property(property, ptr) }.read_string
+      FFI::MemoryPointer.new(:char, CS_MAX_CHAR) { |ptr| get_property(property, ptr, CS_MAX_CHAR) }.get_bytes(0, CS_MAX_CHAR)
     end
 
     def get_int_property(property)
-      FFI::MemoryPointer.new(:int) { |ptr| get_property(property, ptr) }.read_int
+      FFI::MemoryPointer.new(:int) { |ptr| get_property(property, ptr, ptr.size) }.read_int
     end
 
     def set_int_property(property, int)
@@ -125,8 +99,8 @@ module Sybase
       Lib.check Lib.ct_con_props(@ptr, CS_SET, property, ptr, CS_UNUSED, nil), "ct_con_prop(#{property} => #{int.inspect}) failed"
     end
 
-    def get_property(property, ptr)
-      Lib.check Lib.ct_con_props(@ptr, CS_GET, property, ptr, CS_UNUSED, nil), "ct_con_prop(CS_GET, #{property}) failed"
+    def get_property(property, ptr, length)
+      Lib.check Lib.ct_con_props(@ptr, CS_GET, property, ptr, length, nil), "ct_con_prop(CS_GET, #{property}) failed"
     end
   end # Connection
 end # Sybase

data/lib/sybase/constants.rb

@@ -33,6 +33,7 @@ module Sybase
   CS_FAIL               = 0
   CS_UNUSED             = -99999
   CS_CANCEL_CURRENT     = 6000
+  CS_CANCEL_ALL         = 6001
   CS_FMT_UNUSED         = 0
   CS_FMT_NULLTERM       = 1
 

data/lib/sybase/version.rb

@@ -1,3 +1,3 @@
 module Sybase
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -2,7 +2,7 @@
 name: ffi-sybase
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jari Bakken
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-19 00:00:00 +01:00
-default_executable: 
+date: 2011-04-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
@@ -40,9 +39,11 @@ files:
 - README
 - Rakefile
 - TODO
-- examples/sp_who.rb
+- examples/low_level.rb
+- examples/simple.rb
 - ffi-sybase.gemspec
 - lib/ffi-sybase.rb
+- lib/sybase/client.rb
 - lib/sybase/command.rb
 - lib/sybase/connection.rb
 - lib/sybase/constants.rb
@@ -54,7 +55,6 @@ files:
 - lib/sybase/structs/message.rb
 - lib/sybase/structs/server_message.rb
 - lib/sybase/version.rb
-has_rdoc: true
 homepage: http://github.com/jarib/ffi-sybase
 licenses: []
 
@@ -78,9 +78,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ffi-sybase
-rubygems_version: 1.5.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Ruby/FFI bindings for Sybase OCS
 test_files: []
 
+has_rdoc: