github-ds 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e72707c0bbfc8fcf2e846d4e16e6735b8b457728
-  data.tar.gz: 11e5d2059aafe9dc81e7cd343c0a1b7218ca23e6
+  metadata.gz: 716ec52fb178302c762091225dc4ab8b1b61a793
+  data.tar.gz: dd79687dfd3a302ebff1978a9f2ea18adf649a05
 SHA512:
-  metadata.gz: a9f34c95c26ee3edd98d27acefa2d1ea8ca6c1197c36f1616c0dbc387e2f76c4a16c497024565a85de00138031ec8955ab40bd61c6545e3a6ef0e28f4ef1bfbe
-  data.tar.gz: 38586c9b89eaefa299d45e94ed9beb03cbc21b230c301aada2db21aeab27ff8a851cce41ddfc7f7cec0cfd56193e66a1ff62588f57d930ef3089cecbf3c2634f
+  metadata.gz: f23f9d2e7467159b263ec39352c22f1e400198a81dc5294fea08c0e99361f9fe76a44f5a694979fe72359cf8d174dd9655503e8c7f8ea3aa3a0bc8cbb4c28468
+  data.tar.gz: 732716e7a5a28b5526934ad854e1148b17c35322546d01fce321b26417067dd9542d026ef69dfed371dede8a744871a3a505053fc93a7c560de851a845e663e5

data/.travis.yml

@@ -1,11 +1,11 @@
 language: ruby
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.0
-before_script: gem install bundler -v 1.14.6
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
 script: bundle exec rake
 env:
-  - RAILS_VERSION=5.1.0
-  - RAILS_VERSION=5.0.0
-  - RAILS_VERSION=4.2.5
+  - RAILS_VERSION=5.1.5
+  - RAILS_VERSION=5.0.6
+  - RAILS_VERSION=4.2.10

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.2.9
+
+Fixes
+
+* Passing duplicate values to columns in a SQL statement (ex `SELECT id, NULL, NULL, name from repositories`) used to return an array of results with de-duplicated values. (ex `[[1, nil, "github"]]` instead of `[[1, nil, nil, "github"]]`. This had some unfortunate side-effects when parsing results so we changed the code to behave closer to `ActiveRecord::Result` objects. Now if you pass duplicated columns the `results` array will return all the values. The hash will only return unique columns because hashes cannot contain duplicate keys.
+
 ## 0.2.8
 
 Fixes

data/Gemfile

@@ -2,5 +2,11 @@ source "https://rubygems.org"
 gemspec
 
 DEFAULT_RAILS_VERSION = '5.0.2'
+
+if ENV['RAILS_VERSION'] = '4.2.10'
+  gem 'mysql2', '~> 0.3.18'
+else
+  gem "mysql2"
+end
 gem "rails", "~> #{ENV['RAILS_VERSION'] || DEFAULT_RAILS_VERSION}"
 gem "activerecord", "~> #{ENV['RAILS_VERSION'] || DEFAULT_RAILS_VERSION}"

data/README.md

@@ -191,6 +191,8 @@ KV supports expiring keys and obeys expiration when performing operations, but d
 
 After checking out the repo, run `script/bootstrap` to install dependencies. Then, run `script/test` to run the tests. You can also run `script/console` for an interactive prompt that will allow you to experiment.
 
+**Note**: You will need a MySQL database with no password set for the root user for the tests. Running `docker-compose up` will boot just that. This functionality is not currently used by GitHub and was from a contributor, so please let us know if it does not work or gets out of date (pull request is best, but an issue will do).
+
 To install this gem onto your local machine, run `script/install`. To release a new version, update the version number in `version.rb`, commit, and then run `script/release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing

data/docker-compose.yml

@@ -0,0 +1,8 @@
+version: '3'
+services:
+  mysql:
+    image: mysql:5.6
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=yes
+    ports:
+      - "3306:3306"

data/lib/github/ds/version.rb

@@ -1,5 +1,5 @@
 module GitHub
   module DS
-    VERSION = "0.2.8"
+    VERSION = "0.2.9"
   end
 end

data/lib/github/kv.rb

@@ -270,6 +270,29 @@ module GitHub
       nil
     end
 
+    # ttl :: String -> Result<[Time | nil]>
+    #
+    # Returns the expires_at time for the specified key or nil.
+    #
+    # Example:
+    #
+    #  kv.ttl("foo")
+    #    # => #<Result value: 2018-04-23 11:34:54 +0200>
+    #
+    #  kv.ttl("foo")
+    #    # => #<Result value: nil>
+    #
+    def ttl(key)
+      validate_key(key)
+
+      Result.new {
+        GitHub::SQL.value(<<-SQL, :key => key, :connection => connection)
+          SELECT expires_at FROM key_values
+          WHERE `key` = :key AND (expires_at IS NULL OR expires_at > NOW())
+        SQL
+      }
+    end
+
   private
     def validate_key(key, error_message: nil)
       unless key.is_a?(String)

data/lib/github/sql.rb

@@ -21,11 +21,18 @@ module GitHub
   # * `nil` is always considered an error and not a usable value. If you need a
   #    SQL NULL, use the NULL constant instead.
   #
-  # * Identical column names in SELECTs will be overridden:
-  #   `SELECT t1.id, t2.id FROM...` will only return one value for `id`. To get
-  #   more than one column of the same name, use aliases:
+  # * Identical column names in SELECTs will be overridden for hash_results:
+  #   `SELECT t1.id, t2.id FROM...` will only return one value for `id`. The
+  #   second ID colum won't be included in the hash:
+  #
+  #   [{ "id" => "1" }]
+  #
+  #   To get more than one column of the same name, use aliases:
   #   `SELECT t1.id t1_id, t2.id t2_id FROM ...`
   #
+  #   Calling `results` however will return an array with all the values:
+  #   [[1, 1]]
+  #
   # * Arrays are escaped as `(item, item, item)`. If you need to insert multiple
   #   rows (Arrays of Arrays), you must specify the bind value using
   #   GitHub::SQL::ROWS(array_of_arrays).
@@ -232,9 +239,9 @@ module GitHub
 
         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").to_ary
-          @results = @hash_results.map(&:values)
-
+          ar_results = connection.select_all(query, "#{self.class.name} Select")
+          @hash_results = ar_results.to_ary
+          @results = ar_results.rows
         else
           @results = connection.execute(query, "#{self.class.name} Execute").to_a
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github-ds
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - GitHub Open Source
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2018-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -147,6 +147,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- docker-compose.yml
 - examples/example_setup.rb
 - examples/kv.rb
 - examples/result.rb
@@ -191,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A collection of libraries for working with SQL on top of ActiveRecord's connection.