surus 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a513dd97a43e25dbe91de60dee39323f42b410a
-  data.tar.gz: 092f7b1ea714785b14f59f68088f33101ae57244
+  metadata.gz: 8c16570a2c0344b5f4294041a7a6b6e0e5d03674
+  data.tar.gz: b28d6a4a328a01228cbaef0eb6d2024199e5cd64
 SHA512:
-  metadata.gz: 111bcea66d6e02e09a8b7314e3768399dd55422ecb403305461bdd4d4f16fcc62f97181d41e6cbf7551fdd4772201bbcdc9d7f5b9a77c2f3ce0482efe0a64d3c
-  data.tar.gz: e4e759ac1c896166afae2e26033667b30f88f578ba1a9dc3c3caef6374252b3a19cc1491d397dd1dc11ea383e45d15246e779f97eacee2219124eed47ff52473
+  metadata.gz: d610452b370a09fa5ae3b3a131e17439d52b625b827924cc15cc17d226b6df86f2310feed010028dda5541c675e5e36b5eab196dcca0123a8a6411108f922916
+  data.tar.gz: 7ba624e05ff271e1b4587c16101adba2616b5e070ae35415dc96221a542eb33a67537f8492777049afed5d676cd6f6c8181ec020b31ed403031068ad29400d76

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.5.1 (August 29, 2014)
+
+* Quote assocation column names
+* Omitting 'as' results in syntax error with belongs to relationship (Michael J. Cohen)
+* Fix (find|all)_json when scope chain has joins with ambiguous names
+
+# 0.5.0 (August 19, 2013)
+
+* Rails 4 support
+
 # 0.4.2 (June 21, 2013)
 
 * Make pg a development dependency to allow usage with JRuby

data/lib/surus/json/query.rb

@@ -30,7 +30,9 @@ module Surus
         if options.key? :columns
           options[:columns]
         else
-          table_columns.map(&:name)
+          table_columns.map do |c|
+            "#{quoted_table_name}.#{connection.quote_column_name c.name}"
+          end
         end
       end
 
@@ -48,7 +50,7 @@ module Surus
             association_scope = HasAndBelongsToManyScopeBuilder.new(original_scope, association).scope
             ArrayAggQuery.new(association_scope, association_options).to_sql
           end
-          "(#{subquery}) #{association_name}"
+          "(#{subquery}) #{connection.quote_column_name association_name}"
         end
       end
 

data/lib/surus/version.rb

@@ -1,3 +1,3 @@
 module Surus
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/json/json_spec.rb

@@ -22,6 +22,16 @@ describe 'json' do
       end
     end
 
+    context 'when scope chain has a joins with ambiguous column names' do
+      it 'works' do
+        user = FactoryGirl.create :user
+        FactoryGirl.create :post, author: user
+        to_json = Oj.load user.to_json
+        find_json = Oj.load User.joins(:posts).find_json(user.id)
+        expect(find_json).to eq(to_json)
+      end
+    end
+
     context 'with includes option' do
       it 'includes entire belongs_to object' do
         post = FactoryGirl.create :post
@@ -94,6 +104,15 @@ describe 'json' do
         expect(find_json).to eq(to_json)
       end
 
+      it 'includes has_many association with a PostgreSQL reserved word as name' do
+        user = FactoryGirl.create :user
+        posts = FactoryGirl.create_list :post, 2, author: user
+        user.reload
+        to_json = Oj.load user.to_json(include: :rows)
+        find_json = Oj.load User.find_json(user.id, include: :rows)
+        expect(find_json).to eq(to_json)
+      end
+
       it 'includes entire has_and_belongs_to_many association' do
         post = FactoryGirl.create :post
         tag = FactoryGirl.create :tag

data/spec/spec_helper.rb

@@ -27,6 +27,9 @@ class User < ActiveRecord::Base
     -> { where subject: 'foo' },
     foreign_key: :author_id,
     class_name: 'Post'
+
+  # association name is reserved word in PostgreSQL
+  has_many :rows, foreign_key: :author_id, class_name: 'Post', table_name: 'posts'
 end
 
 class Forum < ActiveRecord::Base

data/surus.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
                     It also can control PostgreSQL synchronous commit behavior. By relaxing
                     PostgreSQL's durability guarantee, transaction commit rate can be increased by
                     50% or more. }
+  s.license     = 'MIT'
 
   s.rubyforge_project = ""
 

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: surus
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Jack Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.11
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.2
 description: "Surus accelerates ActiveRecord with PostgreSQL specific types and\n
@@ -161,8 +161,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -205,7 +205,8 @@ files:
 - surus.gemspec
 - tmp/rspec_guard_result
 homepage: https://github.com/JackC/surus
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -213,17 +214,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ''
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: PostgreSQL Acceleration for ActiveRecord
@@ -238,4 +239,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/synchronous_commit/connection_spec.rb
 - spec/synchronous_commit/model_spec.rb
-has_rdoc: