github-ds 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71f03b79bb5da02405c55e147147550eede9a120
-  data.tar.gz: 69c8978ef97b5d7a45e005cbbdf371ce601c68bc
+  metadata.gz: 4f0dadce425b6c2825dfc31cb30dded17ca6c3e3
+  data.tar.gz: c97fde1c4929410829d1c0c5f91a9a9395f04cf5
 SHA512:
-  metadata.gz: 4d7c7c75907e73190497e58bdda8a9729a334e7aa05f6482c57ea1f0a48ed0db9871728604f7160e23d02e0d641d581241113d3f0bb85b90959c877b2fa84b44
-  data.tar.gz: 600871b7b135f7d0544e74e05921e97b1e6c292046b14306bbbe68155c3c8df7bb3a42a2abe18769db41c011787c82dfd1cd3d3411b3fd10ab8b55f92b413971
+  metadata.gz: 66eb4455a6fcc0cfe31a643e333d07681df935e1f841d69206637c1eb7c444c048e62f69ea7a7697af4895f879c4a027edfab8be0afb77f7f2155a88d17e0da6
+  data.tar.gz: 491aef5523514c7d95ebcf69523a9ae1f88e38abbb524ed0ac5648545e22323bf5c2142c4e223671f89cbb1f3daca219890268a15c9049ec64ad6f708dacab6b

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.2.3
+
+Additions
+
+* github-ds does not use `blank?` anymore hence not depending on `active_support/core_ext/object/blank` https://github.com/github/github-ds/commit/a22c397eaaa00bb441fb4a0ecdf3e371daa9001a
+
+Fixes
+
+* `ActiveRecord::Base.default_timezone` is not unintentionally set to `nil` https://github.com/github/github-ds/pull/22
+
 ## 0.2.2
 
 Additions

data/README.md

@@ -208,6 +208,7 @@ Nothing currently on our radar other than continued maintenance. Have a big idea
 |---|---|
 | ![@charliesome](https://avatars3.githubusercontent.com/u/179065?s=64) | [@charliesome](https://github.com/charliesome) |
 | ![@jnunemaker](https://avatars3.githubusercontent.com/u/235?s=64) | [@jnunemaker](https://github.com/jnunemaker) |
+| ![@miguelff](https://avatars3.githubusercontent.com/u/210307?s=64) | [@miguelff](https://github.com/miguelff) |
 | ![@zerowidth](https://avatars3.githubusercontent.com/u/3999?s=64) | [@zerowidth](https://github.com/zerowidth) |
 
 ## License

data/lib/github/ds/version.rb

@@ -1,5 +1,5 @@
 module GitHub
   module DS
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

data/lib/github/sql.rb

@@ -149,7 +149,7 @@ module GitHub
       @connection = @binds.delete :connection
       @force_tz   = @binds.delete :force_timezone
 
-      add query if !query.nil?
+      add query
     end
 
     # Public: Add a chunk of SQL to the query. Any ":keyword" tokens in the SQL
@@ -163,20 +163,22 @@ module GitHub
     # Returns self.
     # Raises GitHub::SQL::BadBind for unknown keyword tokens.
     def add(sql, extras = nil)
-      return self if sql.blank?
+      return self if sql.nil? || sql.empty?
 
       query << " " unless query.empty?
 
-      if @force_tz
-        zone = ActiveRecord::Base.default_timezone
-        ActiveRecord::Base.default_timezone = @force_tz
-      end
+      begin
+        if @force_tz
+          zone = ActiveRecord::Base.default_timezone
+          ActiveRecord::Base.default_timezone = @force_tz
+        end
 
-      query << interpolate(sql.strip, extras)
+        query << interpolate(sql.strip, extras)
 
-      self
-    ensure
-      ActiveRecord::Base.default_timezone = zone if @force_tz
+        self
+      ensure
+        ActiveRecord::Base.default_timezone = zone if @force_tz
+      end
     end
 
     # Public: Add a chunk of SQL to the query, unless query generated so far is empty.
@@ -270,38 +272,40 @@ module GitHub
       return @results if defined? @results
       return [] if frozen?
 
-      if @force_tz
-        zone = ActiveRecord::Base.default_timezone
-        ActiveRecord::Base.default_timezone = @force_tz
-      end
+      begin
+        if @force_tz
+          zone = ActiveRecord::Base.default_timezone
+          ActiveRecord::Base.default_timezone = @force_tz
+        end
 
-      case query
-      when /\ADELETE/i
-        @affected_rows = connection.delete(query, "#{self.class.name} Delete")
+        case query
+        when /\ADELETE/i
+          @affected_rows = connection.delete(query, "#{self.class.name} Delete")
 
-      when /\AINSERT/i
-        @last_insert_id = connection.insert(query, "#{self.class.name} Insert")
+        when /\AINSERT/i
+          @last_insert_id = connection.insert(query, "#{self.class.name} Insert")
 
-      when /\AUPDATE/i
-        @affected_rows = connection.update(query, "#{self.class.name} Update")
+        when /\AUPDATE/i
+          @affected_rows = connection.update(query, "#{self.class.name} Update")
 
-      when /\ASELECT/i
-        # Why not execute or select_rows? Because select_all hits the query cache.
-        @hash_results = connection.select_all(query, "#{self.class.name} Select")
-        @results = @hash_results.map(&:values)
+        when /\ASELECT/i
+          # Why not execute or select_rows? Because select_all hits the query cache.
+          @hash_results = connection.select_all(query, "#{self.class.name} Select")
+          @results = @hash_results.map(&:values)
 
-      else
-        @results = connection.execute(query, "#{self.class.name} Execute").to_a
-      end
+        else
+          @results = connection.execute(query, "#{self.class.name} Execute").to_a
+        end
 
-      @results ||= []
+        @results ||= []
 
-      retrieve_found_row_count
-      freeze
+        retrieve_found_row_count
+        freeze
 
-      @results
-    ensure
-      ActiveRecord::Base.default_timezone = zone if @force_tz
+        @results
+      ensure
+        ActiveRecord::Base.default_timezone = zone if @force_tz
+      end
     end
 
     # Public: If the query is a SELECT, return an array of hashes instead of an array of arrays.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github-ds
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - GitHub Open Source
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A collection of libraries for working with SQL on top of ActiveRecord's connection.