rubyfb 0.5.2-x86-linux → 0.5.3-x86-linux

data/CHANGELOG

@@ -1,6 +1,18 @@
+v0.5.3 ==
+rename top module to Rubyfb
+!!!WARNING!!!
+this change breaks the "drop in" compatibility with FireRuby if FireRuby module name 
+was explicitly used. Simple search and replace should do the work
+
+RubyfbAdapter - add support for :sql_role_name connection option
+Add new class ProcedureCall - representing firebird stored procedure
+Add prepare_call() function to the Rubyfb::Connection class - returning ProcedureCall object
+Add execute_procedure(procedure_name, parameter_values) function to the RubyfbAdapter class
+Windows build fixes
+
 v0.5.2 ==
 Use Echoe as build system
 By default release as  "source only" gem
-Add binary build/release rake tasks - binpkg, binrelease
+Add binary build rake task - binpkg
 
 v0.5.1 initial version

data/Manifest

@@ -43,13 +43,17 @@ ext/Transaction.h
 ext/TypeMap.c
 ext/TypeMap.h
 ext/extconf.rb
-ext/mkmf.bat
+lib/Connection.rb
+lib/ProcedureCall.rb
 lib/SQLType.rb
 lib/active_record/connection_adapters/rubyfb_adapter.rb
 lib/mkdoc
 lib/rubyfb.rb
 lib/rubyfb_lib.so
 lib/src.rb
+mswin32fb/fbclient_ms.lib
+mswin32fb/ibase.h
+mswin32fb/iberror.h
 test/AddRemoveUserTest.rb
 test/BackupRestoreTest.rb
 test/BlobTest.rb

data/Rakefile

@@ -1,12 +1,13 @@
 require 'echoe'
-e = Echoe.new('rubyfb', '0.5.2') do |p|
+e = Echoe.new('rubyfb', '0.5.3') do |p|
   p.description    = "Firebird SQL access library"
   p.url            = "http://rubyforge.org/projects/rubyfb"
   p.author         = "George Georgiev"
   p.email          = "georgiev@heatbs.com"
   p.rdoc_pattern   = ["{examples,ext,lib}/*.rb", "CHANGELOG", "README", "LICENSE"]
+  p.need_tar_gz    = !PLATFORM.include?("win32")
 
-  unless (ARGV & ["binpkg", "binrelease"]).empty?
+  if ARGV.include? "binpkg"
     p.platform=Gem::Platform::CURRENT
     p.eval = Proc.new {
       self.extensions=nil
@@ -15,6 +16,6 @@ e = Echoe.new('rubyfb', '0.5.2') do |p|
   end
 end
 e.clean_pattern = e.clean_pattern - e.clean_pattern.grep(/^lib/)
+e.clean_pattern = e.clean_pattern - e.clean_pattern.grep(/^mswin32fb/)
 
 task :binpkg => [:compile, :repackage]
-task :binrelease => [:compile, :release]

data/ext/FireRuby.c

@@ -206,7 +206,7 @@ VALUE getColumnType(const XSQLVAR *column)
  */
 void Init_rubyfb_lib(void)
 {
-   VALUE module = rb_define_module("FireRuby"),
+   VALUE module = rb_define_module("Rubyfb"),
          array  = rb_ary_new(),
          hash   = rb_hash_new();
 

data/ext/ResultSet.c

@@ -262,6 +262,7 @@ VALUE fetchResultSetEntry(VALUE self)
    Data_Get_Struct(self, ResultsHandle, results);
    if(results->handle != 0)
    {
+		VALUE array,number;
 		value = results->procedure_output_fetch_state;
 		if(value < 0) {
 			value = isc_dsql_fetch(status, &results->handle, results->dialect,
@@ -270,8 +271,8 @@ VALUE fetchResultSetEntry(VALUE self)
 			/* move procedure_output_fetch_state ahead - fetch only one row */
 			results->procedure_output_fetch_state = 100;
 		}
-		VALUE array  = Qnil,
-				number = Qnil;
+		array  = Qnil;
+		number = Qnil;
 		switch(value)
 		{
 			case 0 :

data/ext/extconf.rb

@@ -12,10 +12,12 @@ if PLATFORM.include?("darwin")
    firebird_lib="/Library/Frameworks/Firebird.framework/Libraries"
 elsif PLATFORM.include?("win32")
    $LDFLAGS = $LDFLAGS + " fbclient_ms.lib"
-   $CFLAGS  = $CFLAGS + " -DOS_WIN32"
+   $CFLAGS  = "-MT #{$CFLAGS}".gsub!(/-MD\s*/, '') + " -DOS_WIN32"
    dir_config("win32")
    dir_config("winsdk")
    dir_config("dotnet")
+   firebird_include="../mswin32fb"
+   firebird_lib="../mswin32fb"
 elsif PLATFORM.include?("linux")
    $LDFLAGS = $LDFLAGS + " -lfbclient -lpthread"
    $CFLAGS  = $CFLAGS + " -DOS_UNIX"

data/lib/Connection.rb

@@ -0,0 +1,8 @@
+module Rubyfb
+  class Connection
+    # Creates stored procedure call object
+    def prepare_call(procedure_name)
+      Rubyfb::ProcedureCall.new(self, procedure_name)
+    end
+  end
+end

data/lib/ProcedureCall.rb

@@ -0,0 +1,65 @@
+module Rubyfb
+  class ProcedureCall
+    attr_reader :connection, :procedure_name, :param_names
+
+    def initialize(connection, procedure_name)
+      @procedure_name=procedure_name
+      @connection=connection
+      @param_names = []
+      connection.execute_immediate(
+        "SELECT RDB$PARAMETER_NAME
+        FROM RDB$PROCEDURE_PARAMETERS
+        WHERE RDB$PROCEDURE_NAME='#{procedure_name}' and RDB$PARAMETER_TYPE = 0
+        ORDER BY RDB$PARAMETER_NUMBER"
+      ) do |row|
+        row.each do |col, val|
+          @param_names << column_key(val)
+        end
+      end
+    end
+
+    # execute stored procedure vith parameter values bound to values
+    # passing NULL for all parameters not found in values
+    # returns output parameters as a hash - { :output_parameter_name=>value, ... }
+    def execute(values={}, transaction=nil)
+      result = {}
+      execute_statement(values, transaction) do |row|
+        row.each do |col, value|
+          result[column_key(col)] = value
+        end
+      end
+      return result
+    end
+
+    # returns string containing coma separated parameter values
+    # corresponding to param_names array, quoted/formated in SQL format
+    def sql_value_list(values)
+      param_names.collect{|p| quote_value(values[p])}.join(',')
+    end
+
+    def quote_value(value)
+      # TODO - proper quoting
+      value ? "'#{value}'" : "NULL"
+    end
+  private
+    def bind_params(values)
+      "(#{sql_value_list(values)})" unless param_names.empty?
+    end
+
+    def gen_sql(values)
+      "execute procedure #{procedure_name}#{bind_params(values)};"
+    end
+
+    def execute_statement(values={}, transaction=nil, &block)
+      if transaction
+        connection.execute(gen_sql(values), transaction, &block)
+      else
+        connection.execute_immediate(gen_sql(values), &block)
+      end
+    end
+
+    def column_key(column_name)
+      (column_name =~ /[[:lower:]]/ ? column_name : column_name.downcase).strip.intern
+    end
+  end
+end

data/lib/SQLType.rb

@@ -18,7 +18,7 @@
 # The Initial Developer of the Original Code is Peter Wood. All Rights
 # Reserved.
 
-module FireRuby
+module Rubyfb
    # This class is used to represent SQL table column tables.
    class SQLType
       # A definition for a base SQL type.
@@ -221,4 +221,4 @@ module FireRuby
          end
       end
    end # End of the SQLType class.
-end # End of the FireRuby module.
+end # End of the FireRuby module.

data/lib/active_record/connection_adapters/rubyfb_adapter.rb

@@ -1,7 +1,7 @@
 # Author: Ken Kunz <kennethkunz@gmail.com>
 require 'active_record/connection_adapters/abstract_adapter'
 
-module FireRuby # :nodoc: all
+module Rubyfb # :nodoc: all
   NON_EXISTENT_DOMAIN_ERROR = "335544569"
   class Database
     def self.db_string_for(config)
@@ -18,6 +18,18 @@ module FireRuby # :nodoc: all
       return db
     end
   end
+
+  class ProcedureCall
+    class SQLParser < ActiveRecord::Base
+      def self.bind_params(sql_array)
+        sanitize_sql_array(sql_array)
+      end
+    end
+
+    def sql_value_list(values)
+      SQLParser.bind_params([param_names.collect{|p| '?'}.join(',')] + param_names.collect{|p| values[p]})
+    end
+  end
 end
 
 module ActiveRecord
@@ -25,8 +37,11 @@ module ActiveRecord
     def self.rubyfb_connection(config) # :nodoc:
       require_library_or_gem 'rubyfb'
       config.symbolize_keys!
-      db = FireRuby::Database.new_from_config(config)
+      db = Rubyfb::Database.new_from_config(config)
       connection_params = config.values_at(:username, :password)
+      if config[:sql_role_name]
+        connection_params << {Rubyfb::Connection::SQL_ROLE_NAME=>config[:sql_role_name]}
+      end
       connection = db.connect(*connection_params)
       ConnectionAdapters::RubyfbAdapter.new(connection, logger, connection_params)
     end
@@ -46,7 +61,7 @@ module ActiveRecord
       VARCHAR_MAX_LENGTH = 32_765
 
       def initialize(connection, name, domain, type, sub_type, length, precision, scale, default_source, null_flag)
-        @firebird_type = FireRuby::SQLType.to_base_type(type, sub_type).to_s
+        @firebird_type = Rubyfb::SQLType.to_base_type(type, sub_type).to_s
 
         super(name.downcase, nil, @firebird_type, !null_flag)
         
@@ -118,11 +133,6 @@ module ActiveRecord
         end
     end
 
-    # The Firebird adapter relies on the FireRuby[http://rubyforge.org/projects/fireruby/]
-    # extension, version 0.4.0 or later (available as a gem or from
-    # RubyForge[http://rubyforge.org/projects/fireruby/]). FireRuby works with
-    # Firebird 1.5.x on Linux, OS X and Win32 platforms.
-    #
     # == Usage Notes
     #
     # === Sequence (Generator) Names
@@ -261,6 +271,8 @@ module ActiveRecord
     # <tt>:charset</tt>::
     #   Specifies the character set to be used by the connection. Refer to
     #   Firebird documentation for valid options.
+    # <tt>:sql_role_name</tt>::
+    #   Specifies the SQL role name used by the connection.
     class RubyfbAdapter < AbstractAdapter
       TEMP_COLUMN_NAME = 'AR$TEMP_COLUMN'
 
@@ -374,7 +386,7 @@ module ActiveRecord
 
       def execute(sql, name = nil, &block) # :nodoc:
         exec_result = execute_statement(sql, name, &block)
-        if exec_result.instance_of?(FireRuby::ResultSet)
+        if exec_result.instance_of?(Rubyfb::ResultSet)
           exec_result.close
           exec_result = nil
         end
@@ -409,7 +421,7 @@ module ActiveRecord
       # called directly; used by ActiveRecord to get the next primary key value
       # when inserting a new database record (see #prefetch_primary_key?).
       def next_sequence_value(sequence_name)
-        FireRuby::Generator.new(sequence_name, @connection).next(1)
+        Rubyfb::Generator.new(sequence_name, @connection).next(1)
       end
 
       # Inserts the given fixture into the table. Overridden to properly handle blobs.
@@ -430,7 +442,7 @@ module ActiveRecord
           value = value.to_yaml if col.text? && klass.serialized_attributes[col.name]
           value = value.read if value.respond_to?(:read)
           next if value.nil?  || (value == '')
-          s = FireRuby::Statement.new(@connection, @transaction, "UPDATE #{table_name} set #{col.name} = ? WHERE #{klass.primary_key} = #{id}", 3)       
+          s = Rubyfb::Statement.new(@connection, @transaction, "UPDATE #{table_name} set #{col.name} = ? WHERE #{klass.primary_key} = #{id}", 3)       
           s.execute_for([value.to_s])
           s.close
         end
@@ -449,7 +461,7 @@ module ActiveRecord
         charset = select_rows(sql).first[0].rstrip
         disconnect!
         @connection.database.drop(*@connection_params)
-        FireRuby::Database.create(@connection.database.file,
+        Rubyfb::Database.create(@connection.database.file,
           @connection_params[0], @connection_params[1], 4096, charset)
       end
 
@@ -603,6 +615,10 @@ module ActiveRecord
         end
       end
 
+      def execute_procedure(procedure_name, values={})
+        @connection.prepare_call(procedure_name).execute(values, @transaction)
+      end
+
       private
         def execute_statement(sql, name = nil, &block) # :nodoc:
 	  @fbe = nil
@@ -662,7 +678,7 @@ module ActiveRecord
             row.each do |column, value|
               fields << fb_to_ar_case(column) if row.number == 1
 
-              if FireRuby::Blob === value
+              if Rubyfb::Blob === value
                 temp = value.to_s
                 value.close
                 value = temp
@@ -746,20 +762,20 @@ module ActiveRecord
         end
 
         def copy_sequence_value(from, to)
-          sequence_value = FireRuby::Generator.new(default_sequence_name(from), @connection).last
+          sequence_value = Rubyfb::Generator.new(default_sequence_name(from), @connection).last
           execute_statement("SET GENERATOR #{default_sequence_name(to)} TO #{sequence_value}")
         end
 
         def sequence_exists?(sequence_name)
-          FireRuby::Generator.exists?(sequence_name, @connection)
+          Rubyfb::Generator.exists?(sequence_name, @connection)
         end
 
         def create_sequence(sequence_name)
-          FireRuby::Generator.create(sequence_name.to_s, @connection)
+          Rubyfb::Generator.create(sequence_name.to_s, @connection)
         end
 
         def drop_sequence(sequence_name)
-          FireRuby::Generator.new(sequence_name.to_s, @connection).drop
+          Rubyfb::Generator.new(sequence_name.to_s, @connection).drop
         end
 
         def create_boolean_domain
@@ -785,7 +801,7 @@ module ActiveRecord
         end
 
         def non_existent_domain_error?
-          $!.message.include? FireRuby::NON_EXISTENT_DOMAIN_ERROR
+          $!.message.include? Rubyfb::NON_EXISTENT_DOMAIN_ERROR
         end
 
         # Maps uppercase Firebird column names to lowercase for ActiveRecord;
@@ -802,4 +818,3 @@ module ActiveRecord
     end
   end
 end
-

data/lib/rubyfb.rb

@@ -1,2 +1,5 @@
 require 'rubyfb_lib'
 require 'SQLType'
+require 'ProcedureCall'
+require 'Connection'
+