activerecord-fb-adapter 0.7.5 → 0.7.8

data/lib/active_record/connection_adapters/fb_adapter.rb

@@ -22,7 +22,7 @@ module Arel
         ].compact.join ' '
       end
 
-      def visit_Arel_Nodes_UpdateStatement o
+      def visit_Arel_Nodes_UpdateStatement(o)
         [
           "UPDATE #{visit o.relation}",
           ("SET #{o.values.map { |value| visit(value) }.join ', '}" unless o.values.empty?),
@@ -81,13 +81,6 @@ module ActiveRecord
         @domain, @sub_type, @precision, @scale = domain, sub_type, precision, scale
       end
 
-      # def type
-      #   if @type == :binary and @sub_type == 1
-      #     :text
-      #   else
-      #     @type
-      #   end
-      # end
       def type
         if @domain =~ /BOOLEAN/
           :boolean
@@ -106,7 +99,12 @@ module ActiveRecord
           sql = "SELECT CAST(#{@default} AS #{column_def}) FROM RDB$DATABASE"
           connection = ActiveRecord::Base.connection
           if connection
-            type_cast connection.select_one(sql)['cast']
+            value = connection.select_one(sql)['cast']
+            if value.acts_like?(:date) or value.acts_like?(:time)
+              nil
+            else
+              type_cast(value)
+            end
           else
             raise ConnectionNotEstablished, "No Firebird connections established."
           end
@@ -176,7 +174,7 @@ module ActiveRecord
     #
     # ...you can add the following line to your <tt>environment.rb</tt> file:
     #
-    #  ActiveRecord::ConnectionAdapters::FbAdapter.boolean_domain = { :true => 'T', :false => 'F' }
+    #  ActiveRecord::ConnectionAdapters::FbAdapter.boolean_domain = { :true => 'T', :false => 'F', :name => 'BOOLEAN', :type => 'char' }
     #
     # === Column Name Case Semantics
     # Firebird and ActiveRecord have somewhat conflicting case semantics for
@@ -406,16 +404,22 @@ module ActiveRecord
       # end
 
     protected
-      def translate(sql)
-        sql.gsub!(/\bIN\s+\(NULL\)/i, 'IS NULL')
-        sql.sub!(/\bWHERE\s.*$/im) do |m|
-          m.gsub(/\s=\s*NULL\b/i, ' IS NULL')
+      if defined?(Encoding)
+        def decode(s)
+          Base64.decode64(s).force_encoding(@connection.encoding)
         end
+      else
+        def decode(s)
+          Base64.decode64(s)
+        end
+      end
+
+      def translate(sql)
         sql.gsub!(/\sIN\s+\([^\)]*\)/mi) do |m|
-          m.gsub(/\(([^\)]*)\)/m) { |n| n.gsub(/\@(.*?)\@/m) { |n| "'#{quote_string(Base64.decode64(n[1..-1]))}'" } }
+          m.gsub(/\(([^\)]*)\)/m) { |n| n.gsub(/\@(.*?)\@/m) { |n| "'#{quote_string(decode(n[1..-1]))}'" } }
         end
         args = []
-        sql.gsub!(/\@(.*?)\@/m) { |m| args << Base64.decode64(m[1..-1]); '?' }
+        sql.gsub!(/\@(.*?)\@/m) { |m| args << decode(m[1..-1]); '?' }
         yield(sql, args) if block_given?
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-fb-adapter
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 7
-  - 5
-  version: 0.7.5
+  - 8
+  version: 0.7.8
 platform: ruby
 authors: 
 - Brent Rowland
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-28 00:00:00 -08:00
+date: 2013-08-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency