activerecord-fb-adapter 0.8.4 → 0.8.5

data/lib/active_record/connection_adapters/fb_adapter.rb

@@ -597,16 +597,14 @@ module ActiveRecord
       # +binds+ as the bind substitutes. +name+ is logged along with
       # the executed +sql+ statement.
       def exec_query(sql, name = 'SQL', binds = [])
-        if binds.empty?
-          translate(sql) do |sql, args|
-            log(expand(sql, args), name) do
-              @connection.execute(sql, *args)
-            end
+        translate(sql) do |sql, args|
+          unless binds.empty?
+            args = binds.map { |col, val| type_cast(val, col) } + args
           end
-        else
-          log(sql, name, binds) do
-            args = binds.map { |col, val| type_cast(val, col) }
-            @connection.execute(sql, *args)
+          log(expand(sql, args), name) do
+            fields, rows = @connection.execute(sql, *args) { |cursor| [cursor.fields, cursor.fetchall] }
+            cols = fields.map { |f| f.name }
+            ActiveRecord::Result.new(cols, rows)
           end
         end
       end
@@ -834,7 +832,13 @@ module ActiveRecord
       def add_column(table_name, column_name, type, options = {})
         add_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ADD #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
         add_column_options!(add_column_sql, options)
-        execute(add_column_sql)
+        begin
+          execute(add_column_sql)
+        rescue
+          raise unless non_existent_domain_error?
+          create_boolean_domain
+          execute(add_column_sql)
+        end
         if options[:position]
           # position is 1-based but add 1 to skip id column
           alter_position_sql = "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} POSITION #{options[:position] + 1}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-fb-adapter
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fb