rubyfb 0.6.2 → 0.6.3

data/CHANGELOG

@@ -1,3 +1,10 @@
+v0.6.3 ==
+Fix change_column() migration method
+Fix Segmentation fault in Row class (GC integration issues)
+Remove deprecated require in rubyfb_adapter.rb
+Fix Rails 3.2 "undefined method `accept' for nil:NilClass" - https://github.com/rails/rails/issues/4632
+Add Rails 3.2 explain() support
+
 v0.6.2 ==
 Update arel visitors
 Use round() when scaling fixed parameter values

data/Rakefile

@@ -1,5 +1,5 @@
 require 'echoe'
-e = Echoe.new('rubyfb', '0.6.2') do |p|
+e = Echoe.new('rubyfb', '0.6.3') do |p|
   p.description    = "Firebird SQL access library"
   p.url            = "http://rubyforge.org/projects/rubyfb"
   p.author         = "George Georgiev"

data/ext/Blob.c

@@ -100,13 +100,12 @@ static VALUE getBlobData(VALUE self) {
     Data_Get_Struct(self, BlobHandle, blob);
     if(blob->size > 0) {
       char *buffer = loadBlobData(blob);
-
       if(buffer != NULL) {
         data = rfbstr(connection, blob->charset, buffer, blob->size);
+        free(buffer);
+        rb_iv_set(self, "@data", data);
       }
-      free(buffer);
     }
-    rb_iv_set(self, "@data", data);
   }
 
   return(data);

data/ext/Row.c

@@ -58,6 +58,43 @@ static VALUE rowValuesAt(int, VALUE *, VALUE);
 /* Globals. */
 VALUE cRow;
 
+/**
+ * This function integrates with the Ruby garbage collector to insure that
+ * all resources associated with a Row object are marked during the mark phase
+ *
+ * @param  row  A pointer to the RowHandle object for the Row object.
+ *
+ */
+void rowGCMark(void *handle) {
+  if(handle != NULL) {
+    RowHandle *row = (RowHandle *)handle;
+    int i;
+    for(i = 0; i < row->size; i++) {
+      rb_gc_mark(row->columns[i].value);
+      rb_gc_mark(row->columns[i].type);
+      rb_gc_mark(row->columns[i].scale);
+    }
+  }
+}
+
+/**
+ * This function integrates with the Ruby garbage collector to insure that
+ * all resources associated with a Row object are released whenever the Row
+ * object is collected.
+ *
+ * @param  row  A pointer to the RowHandle object for the Row object.
+ *
+ */
+void freeRow(void *row) {
+  if(row != NULL) {
+    RowHandle *handle = (RowHandle *)row;
+
+    if(handle->columns != NULL) {
+      free(handle->columns);
+    }
+    free(handle);
+  }
+}
 
 /**
  * This function integrates with the Ruby memory allocation system to allocate
@@ -77,7 +114,7 @@ static VALUE allocateRow(VALUE klass) {
     handle->size    = 0;
     handle->number  = 0;
     handle->columns = NULL;
-    row             = Data_Wrap_Struct(klass, NULL, freeRow, handle);
+    row             = Data_Wrap_Struct(klass, rowGCMark, freeRow, handle);
   } else {
     /* Generate an exception. */
     rb_raise(rb_eNoMemError, "Memory allocation failure allocating a row.");
@@ -816,26 +853,6 @@ VALUE rowValuesAt(int size, VALUE *keys, VALUE self) {
 }
 
 
-/**
- * This function integrates with the Ruby garbage collector to insure that
- * all resources associated with a Row object are released whenever the Row
- * object is collected.
- *
- * @param  row  A pointer to the RowHandle object for the Row object.
- *
- */
-void freeRow(void *row) {
-  if(row != NULL) {
-    RowHandle *handle = (RowHandle *)row;
-
-    if(handle->columns != NULL) {
-      free(handle->columns);
-    }
-    free(handle);
-  }
-}
-
-
 /**
  * This function provides a programmatic means of creating a Row object.
  *

data/ext/Row.h

@@ -48,7 +48,6 @@ typedef struct {
 
 /* Function prototypes. */
 void Init_Row(VALUE);
-void freeRow(void *);
 VALUE rb_row_new(VALUE, VALUE, VALUE);
 
 #endif // FIRERUBY_ROW_H

data/ext/Statement.c

@@ -45,6 +45,7 @@ static VALUE execAndCloseStatement(int, VALUE*, VALUE);
 static VALUE closeStatement(VALUE);
 static VALUE getStatementPrepared(VALUE);
 static VALUE prepareStatement(int, VALUE*, VALUE);
+static VALUE getStatementPlan(VALUE);
 
 VALUE execAndManageTransaction(VALUE, VALUE, VALUE);
 VALUE execAndManageStatement(VALUE, VALUE, VALUE);
@@ -687,6 +688,48 @@ static VALUE prepareStatement(int argc, VALUE *argv, VALUE self) {
   return (self);
 }
 
+/**
+ * This function provides the plan method for the Statement class.
+ *
+ * @param  self  A reference to the Statement object to call the method on.
+ *
+ * @return  Query plan
+ *
+ */
+VALUE getStatementPlan(VALUE self) {
+  StatementHandle *statement = getPreparedHandle(self);
+  ISC_STATUS status[ISC_STATUS_LENGTH];
+  unsigned int dataLength = 1024;
+  unsigned short retry = 1;
+  VALUE result = Qnil;
+  char  items[] = {isc_info_sql_get_plan};
+  char *buffer = ALLOC_N(char, dataLength);
+  while(retry == 1) {
+    retry = 0;
+    if(!isc_dsql_sql_info(status, &statement->handle, sizeof(items), items,
+                         dataLength, buffer)) {
+      switch(buffer[0]) {
+        case isc_info_truncated:
+          dataLength = dataLength + 1024;
+          buffer = REALLOC_N(buffer, char, dataLength);
+          retry = 1;
+          break;
+        case isc_info_sql_get_plan:
+          dataLength = isc_vax_integer(&buffer[1], 2);
+          result = rb_str_new(&buffer[3], dataLength);
+          rb_funcall(result, rb_intern("strip!"), 0);
+        default:
+          retry = 0;
+      }
+    }
+  }
+  free(buffer);
+  if (result == Qnil) {
+    rb_fireruby_raise(status, "Error retrieving query plan.");
+  }
+  return (result);
+}
+
 /**
  * This function provides a programmatic means of creating a Statement object.
  *
@@ -797,6 +840,7 @@ void Init_Statement(VALUE module) {
   rb_define_method(cStatement, "parameter_count", getStatementParameterCount, 0);
   rb_define_method(cStatement, "prepare", prepareStatement, -1);
   rb_define_method(cStatement, "prepared?", getStatementPrepared, 0);
+  rb_define_method(cStatement, "plan", getStatementPlan, 0);
 
   rb_define_const(cStatement, "SELECT_STATEMENT",
                   INT2FIX(isc_info_sql_stmt_select));

data/lib/active_record/connection_adapters/rubyfb_adapter.rb

@@ -1,7 +1,6 @@
 # Author: Ken Kunz <kennethkunz@gmail.com>
 require 'digest/sha1'
 require 'active_record/connection_adapters/abstract_adapter'
-require 'active_support/core_ext/kernel/requires'
 require 'rubyfb_options'
 
 if defined?(Arel) then
@@ -332,6 +331,7 @@ module ActiveRecord
         @transaction = nil
         @blobs_disabled = 0
         @statements = {}
+        @visitor = Arel::Visitors::RubyFB.new self if defined?(Arel::Visitors::RubyFB)
       end
 
       def self.visitor_for(pool) # :nodoc:
@@ -516,12 +516,17 @@ module ActiveRecord
           end
           s = cache || @connection.create_statement(sql)
           s.prepare(@transaction) unless s.prepared?
+          
           if Rubyfb::Statement::DDL_STATEMENT == s.type
             clear_cache!
           elsif cache.nil? && !binds.empty?
             @statements[sql] = cache = s
           end
-          if cache
+          if name == 'EXPLAIN'
+            return s.plan.tap do
+              s.close unless cache
+            end
+          elsif cache
             s.exec(binds, @transaction, &block)
           else
             s.exec_and_close(binds, @transaction, &block)
@@ -952,7 +957,7 @@ module ActiveRecord
         end
 
         def change_column_type(table_name, column_name, type, options = {})
-          sql = "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} TYPE #{type_to_sql(type, options[:limit])}"
+          sql = "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} TYPE #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
           exec_query(sql)
         rescue StatementInvalid
           raise unless non_existent_domain_error?
@@ -1084,6 +1089,14 @@ module ActiveRecord
     end
     
     class RubyfbAR31Adapter < RubyfbAdapter
+      def supports_explain?
+        true
+      end
+
+      def explain(arel, binds = [])
+        exec_query(to_sql(arel), 'EXPLAIN', binds)
+      end
+
     protected
       def log(sql, name, binds = nil) #:nodoc:
         super sql, name, binds

data/lib/src.rb

@@ -712,6 +712,15 @@ module Rubyfb
       #
       def close
       end
+
+      #
+      # This method returns the SQL execution plan for the statement
+      #
+      # ==== Exceptions
+      # FireRubyError::  Generated whenever a problem occurs obtaining the plan
+      #
+      def plan
+      end
    end
    
    
@@ -1509,6 +1518,7 @@ module Rubyfb
       #
       # This method is used to set the indicator for whether checksum values
       # should be ignored in performing a backup.
+
       #
       # ==== Parameters
       # setting::  True to ignore checksums, false otherwise.

data/rubyfb.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rubyfb"
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["George Georgiev"]
-  s.date = "2012-01-04"
+  s.date = "2012-02-21"
   s.description = "Firebird SQL access library"
   s.email = "georgiev@heatbs.com"
   s.extensions = ["ext/extconf.rb"]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rubyfb", "--main", "README"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = "rubyfb"
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.11"
   s.summary = "Firebird SQL access library"
 
   if s.respond_to? :specification_version then

data/test/StatementTest.rb

@@ -149,4 +149,14 @@ class StatementTest < Test::Unit::TestCase
          cxn.execute_immediate('DROP TABLE STRING_TEST')
       end
    end
+   
+  def test05
+    @database.connect(DB_USER_NAME, DB_PASSWORD) do |cxn|
+      cxn.execute_immediate('CREATE TABLE PLAN_TEST(TEXT VARCHAR(100) CHARACTER SET UTF8)')
+      s = cxn.create_statement('SELECT * FROM PLAN_TEST')
+      assert_equal("PLAN (PLAN_TEST NATURAL)", s.plan)
+      s.close
+      cxn.execute_immediate('DROP TABLE PLAN_TEST')
+    end
+  end
 end

metadata

@@ -1,30 +1,22 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rubyfb
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 0.6.3
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 2
-  version: 0.6.2
 platform: ruby
-authors: 
+authors:
 - George Georgiev
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-04 00:00:00 Z
+date: 2012-02-21 00:00:00.000000000 Z
 dependencies: []
-
 description: Firebird SQL access library
 email: georgiev@heatbs.com
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGELOG
 - LICENSE
 - README
@@ -36,7 +28,7 @@ extra_rdoc_files:
 - lib/rubyfb.rb
 - lib/rubyfb_options.rb
 - lib/src.rb
-files: 
+files:
 - CHANGELOG
 - LICENSE
 - Manifest
@@ -128,43 +120,33 @@ files:
 - rubyfb.gemspec
 homepage: http://rubyforge.org/projects/rubyfb
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Rubyfb
 - --main
 - README
-require_paths: 
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 11
-      segments: 
-      - 1
-      - 2
-      version: "1.2"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.2'
 requirements: []
-
 rubyforge_project: rubyfb
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Firebird SQL access library
 test_files: []
-