motor-admin 0.2.17 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43b28780732981472580aa188997c0dadbe63723c896370c75517e43cc8af86d
-  data.tar.gz: 4be16dd686ef091f7413255df883a740155daa7885c37d600ac23546b839d7fa
+  metadata.gz: dc4b3959711130ff5e711c91a8a3ae30f996dcbbf83c98a6d2bb108ffed665e6
+  data.tar.gz: c5090823346eb41d62bb400cce5b7c4c4c17b9a9261017aa374a31fa33ca3630
 SHA512:
-  metadata.gz: 046de91e00db2c5db533ce5eae691719ae50fb049bd9221a56681e3692fc4b42b8b4a090243b9b7b407c24e3cfb21bb208f2ce24a61e8967c0839dc9181a0a7d
-  data.tar.gz: a3dbda01e0d6f121ba9b2a90f5cca87bdb67772964627e134e735b4cace582a5a9869087c777069b5c5d5e2a3cc77e49ab843fb25decde19754b5afe64061eee
+  metadata.gz: c46b67ac2fe96276806252c3c56e0472b32b6f91aa2351dd7d8ae76485de59260e2079dd42336c61beb1d28de9f6c0177e32e60d9a5e35c9b7dd8b9e770ff0bf
+  data.tar.gz: d49105316054eab5561cfbbad123cf4e106d7d837446cab63f91149f225022466c7ef3e10442e20789c4c920e9a222dbf27ad552a253cd23267e71356d34fa68

data/lib/motor/active_record_utils/types.rb

@@ -16,6 +16,7 @@ module Motor
         'numeric' => 'float',
         'decimal' => 'float',
         'float4' => 'float',
+        'bpchar' => 'string',
         'float8' => 'float',
         'float16' => 'float',
         'text' => 'string',
@@ -43,11 +44,13 @@ module Motor
 
         return UNIFIED_TYPES.fetch(name, name) if name
 
-        DEFAULT_TYPE
+        nil
       end
 
       def build_types_hash
-        type_map = ActiveRecord::Base.connection.send(:type_map)
+        connection_class = defined?(::ResourceRecord) ? ::ResourceRecord : ActiveRecord::Base
+
+        type_map = connection_class.connection.send(:type_map)
 
         type_map.instance_variable_get('@mapping').map do |name, type|
           next unless name.is_a?(String)

data/lib/motor/queries/run_query.rb

@@ -86,10 +86,10 @@ module Motor
         result.columns.map.with_index do |column_name, index|
           column_type_class = result.column_types[column_name]
 
-          column_type =
-            if column_type_class
-              ActiveRecordUtils::Types.find_name_for_type(column_type_class)
-            else
+          column_type = ActiveRecordUtils::Types.find_name_for_type(column_type_class) if column_type_class
+
+          column_type ||=
+            begin
               not_nil_value = result.rows.reduce(nil) do |acc, row|
                 column = row[index]
 

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.2.17'
+  VERSION = '0.2.18'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.18
 platform: ruby
 authors:
 - Pete Matsyburka