scopiform 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f253cecb3650015cee2485562706dcb2b89775fce8053277a17b4ef8af40fef2
-  data.tar.gz: cfd9fe8cb03609951507ff034fa0e7dd866439e02b56117bfc83325cc02a2329
+  metadata.gz: cca47f44f585db581edd54791485e5016ecc1d8f73c5e09dc0cb3be21a853d0e
+  data.tar.gz: fea9cb2762ac42bdcb1089262ac0e116857fb1d568590bb3c570e9b1f49f60d8
 SHA512:
-  metadata.gz: 110ab7973360c3051202f3d38ed73a40c85682f85dd88f5db4db50e765e62ae59c7986ca69c61a69896b2947c80d0a9bcd5708ef50c546664d73df4762079dfd
-  data.tar.gz: 2af0735c5927191e82e7b291d4732fd803b99a3d20301d17ab6f01295d23a24689d397edf89227f905014894368f082f5651cb6c0b8587a11aa4e59ba423994f
+  metadata.gz: fc021d11757854fc08b8d238ffe7f8bdf2300cf94fb2ceb2d5b87720dbb9de977845343007e6f04377b93f1c95ee94cdc6b89c3daa29ac538cfa184aeb4cae72
+  data.tar.gz: 97669e667b8610924637a185fd5b31c0421f03e54834ccc76fa4ea326fa68ce82e44011ce0c55a47d1f4a2380171c597e5f4c1a7dffca7ed644ee34f0ea8cceb

data/lib/scopiform/helpers.rb

@@ -62,17 +62,26 @@ module Scopiform
       protected
 
       def safe_columns
-        columns
-      rescue ActiveRecord::StatementInvalid
+        @safe_columns ||= columns
+      rescue *safe_column_rescue_errors
         logger.warn "Unable to load columns for `#{name}`"
-        []
+        @safe_columns = []
       end
 
       def safe_columns_hash
-        columns_hash
-      rescue ActiveRecord::StatementInvalid
+        @safe_columns_hash ||= columns_hash
+      rescue *safe_column_rescue_errors
         logger.warn "Unable to load columns_hash for `#{name}`"
-        {}
+        @safe_columns_hash = {}
+      end
+
+      private
+
+      def safe_column_rescue_errors
+        [
+          ActiveRecord::StatementInvalid,
+          Object.const_defined?('TinyTds') ? TinyTds::Error : nil,
+        ]
       end
     end
   end

data/lib/scopiform/version.rb

@@ -1,3 +1,3 @@
 module Scopiform
-  VERSION = '0.2.9'.freeze
+  VERSION = '0.2.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scopiform
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - jayce.pulsipher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord