odbc_adapter 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 791ccc95087c9361555daf8c3f464da82ac3b003
-  data.tar.gz: cc8210e283ac73556cd90c89b7fc6902a7611cd2
+  metadata.gz: 0b346729dc34997485619663c87b6649b2454c2b
+  data.tar.gz: 5cf390727ae990ec1267e26d24ba9304a0b04cd4
 SHA512:
-  metadata.gz: 3aab9df767fd6f5079549eb4c075d4a769d27d53d7d2ec769ddde3ca1c063fa78446d025cae91ca8bc815e35871a5370ba178fb36248be61d2b964d63882b3a7
-  data.tar.gz: 22c3bbef81248cc70ee6bc1e69c16d1bec90ddc7795cb5a6a4db54ff969cfd6e8769591c370222042dc1431b7447a34d9de4888496cec5b8bf2334dbf68890e7
+  metadata.gz: 9649d34b588a48502e6792ad71f37c05c2fb742160f24d95935f5c56984fc41c8641a28f999a9af44891f16d7553683021acc50f52b7945d389176c93c66e96d
+  data.tar.gz: 015a240fe4c71e01cbe710410c61cc24b98b470b7cb55fbb07621a73d334f643a161bd99dafc3ffb8274c6c25ce3ed5503de70ce099712397db4b30ee4a30317

data/bin/console

@@ -2,6 +2,60 @@
 
 require 'bundler/setup'
 require 'odbc_adapter'
+require 'pry'
 
-require 'irb'
-IRB.start
+require 'odbc_adapter/adapters/postgresql_odbc_adapter'
+ODBCAdapter.register(/snowflake/, ODBCAdapter::Adapters::PostgreSQLODBCAdapter) do
+  # Here until we upgrade the ODBC driver
+  class DecimalCaster
+    attr_reader :column
+
+    def initialize(column)
+      @column = column
+    end
+
+    def cast(value)
+      return if value.nil?
+      column.scale.zero? ? value.to_i : value.to_f
+    end
+  end
+
+  # Handles strings that aren't utf-8 encoded
+  class StringEncodingCaster
+    def cast(value)
+      value.is_a?(String) ? value.force_encoding('UTF-8') : value
+    end
+  end
+
+  def quote_column_name(name)
+    name.to_s
+  end
+
+  private
+
+  # Monkey-patch the type casting for SQL_DECIMAL columns until we upgrade the ODBC driver
+  def dbms_type_cast(columns, values)
+    casters = Hash.new { |h, k| h[k] = [StringEncodingCaster.new] }
+
+    columns.each_with_index do |column, idx|
+      casters[idx] << DecimalCaster.new(column) if column.type == ODBC::SQL_DECIMAL
+    end
+
+    values.each do |row|
+      row.each_index do |idx|
+        casters[idx].each { |caster| row[idx] = caster.cast(row[idx]) }
+      end
+    end
+
+    values
+  end
+end
+
+ActiveRecord::Base.establish_connection(adapter: 'odbc', dsn: 'LocalyticsProductionSnowflake')
+
+binding.pry
+
+# class FactSession < ActiveRecord::Base
+# end
+#
+# puts FactSession.where(device_new: true).to_sql

data/lib/active_record/connection_adapters/odbc_adapter.rb

@@ -74,6 +74,7 @@ module ActiveRecord
       include ::ODBCAdapter::SchemaStatements
 
       ADAPTER_NAME = 'ODBC'.freeze
+      BOOLEAN_TYPE = 'BOOLEAN'.freeze
       ERR_DUPLICATE_KEY_VALUE = 23505
 
       attr_reader :dbms

data/lib/odbc_adapter/adapters/mysql_odbc_adapter.rb

@@ -40,6 +40,22 @@ module ODBCAdapter
         string.gsub(/\\/, '\&\&').gsub(/'/, "''")
       end
 
+      def quoted_true
+        '1'
+      end
+
+      def unquoted_true
+        1
+      end
+
+      def quoted_false
+        '0'
+      end
+
+      def unquoted_false
+        0
+      end
+
       def disable_referential_integrity(&block) #:nodoc:
         old = select_value("SELECT @@FOREIGN_KEY_CHECKS")
 

data/lib/odbc_adapter/adapters/postgresql_odbc_adapter.rb

@@ -62,7 +62,7 @@ module ODBCAdapter
 
         case value
         when String
-          return super unless 'bytea' == column.sql_type
+          return super unless 'bytea' == column.native_type
           { value: value, format: 1 }
         else
           super
@@ -75,14 +75,6 @@ module ODBCAdapter
         string.gsub(/\\/, '\&\&').gsub(/'/, "''")
       end
 
-      def quoted_true
-        "'t'"
-      end
-
-      def quoted_false
-        "'f'"
-      end
-
       def disable_referential_integrity #:nodoc:
         execute(tables.map { |name| "ALTER TABLE #{quote_table_name(name)} DISABLE TRIGGER ALL" }.join(';'))
         yield

data/lib/odbc_adapter/quoting.rb

@@ -25,10 +25,6 @@ module ODBCAdapter
       "#{quote_char.chr}#{name}#{quote_char.chr}"
     end
 
-    def quoted_true
-      '1'
-    end
-
     # Ideally, we'd return an ODBC date or timestamp literal escape
     # sequence, but not all ODBC drivers support them.
     def quoted_date(value)

data/lib/odbc_adapter/schema_statements.rb

@@ -48,7 +48,12 @@ module ODBCAdapter
         # SQLColumns: IS_NULLABLE, SQLColumns: NULLABLE
         col_nullable = nullability(col_name, col[17], col[10])
 
-        cast_type = lookup_cast_type(col_sql_type)
+        cast_type =
+          if col_native_type == self.class::BOOLEAN_TYPE
+            ActiveRecord::Type::Boolean.new
+          else
+            lookup_cast_type(col_sql_type)
+          end
         cols << new_column(format_case(col_name), col_default, cast_type, col_sql_type, col_nullable, col_native_type, col_scale, col_limit)
       end
     end

data/lib/odbc_adapter/version.rb

@@ -1,3 +1,3 @@
 module ODBCAdapter
-  VERSION = '4.2.0'
+  VERSION = '4.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odbc_adapter
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Localytics
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-odbc