directiverecord 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjYwOWJkMDk4YmUyZWZkMjcwMThiZDk4NzQ1ZTUzMzJiM2YwYzg1NQ==
+    OTI2YTQyODBjY2FmMmJmYjgyNzZiNDVmOGRjMDA3MjBmNTA1MGQ0ZA==
   data.tar.gz: !binary |-
-    YjA3MDE0YmRjYjA4NTc3NjMyYmZkOGEzMTc4NGUzMjk2NGMwYzgwOQ==
+    YzQ5ODk1MzAxMWYxM2Q1ZDBmNTE4MjkwYTAyMTEyOTM1MjA4OGNlYQ==
 SHA512:
   metadata.gz: !binary |-
-    YmUxZGI1YmYxNWIzMjMyOGM5MWY2NmFmYWMxZGRlOTEyZjFmYjI3ZWE1Mjdk
-    M2MwNGIxYzIzMmYwZWU5ZTNiMGJjZmQ5MmRhNjNjNjAyNzdiNmVmZjk2NjYy
-    NmU4YTc1ODg4OWFkMmRkZmVhMzQ3MjAxMTc1ZmFiNjZmNTI4YzA=
+    ZTEyNjY3NDVkMmQ1YzUzMTg2ZjU3MjdhZDdlYmY1YTk1NjUzMGU3ODdiODE1
+    YzdkMzUwYTU1ZDA1NmFmNDE0N2IxMDdlM2NmMTc0ZTZmODg2NTcyMDBlNTE2
+    ZjA2YTNiMTQ0MGU4N2E1MmE1MzkyOGJjMmY3YjU0YjU1NzI5NmE=
   data.tar.gz: !binary |-
-    YzdiM2Q0ZDI2ODFmMGJiNWNiY2M3MWU1ODQzMjUwMWViZDMxNWU2NzRkYmEy
-    MTBhZTMyN2YyMTVhZWZjOTU4NGYxMjBiYmRjZDg1YTExYTYyNDRkNTVhNTRh
-    YjJjZDhjNDFmZDAyMjgxOWZmYzdjY2Y1NDMyN2RhZDQ4NTA4MjM=
+    YmFmZWQ5Y2E3NDI4MjUzNzQ1ZTJkYzAwMjE1YmFhMmQ1ODM2ZmUyYzAzZTcw
+    ZTk0YmRlMzNlMThkZWFjOWEzMDcxZmI3YTU3ODFhYTRhMTlmYzRlOTNjM2Rl
+    ZDA4MmQ1ODc1YmUzMDMxODMxMmMzZjkzMDI0MmZhYzI0OGI0NWI=

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.1 (January 19, 2015)
+
+* Optimizing query when passing :optimize => true and having paths within the select statement
+* Dropped MonetDB support
+
 == Version 0.1.0 (December 1, 2014)
 
 * Initial release

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/directive_record/query.rb

@@ -1,6 +1,5 @@
 require "directive_record/query/sql"
 require "directive_record/query/mysql"
-require "directive_record/query/monetdb"
 
 module DirectiveRecord
   module Query
@@ -14,10 +13,8 @@ module DirectiveRecord
     def self.class_for(connection_class)
       if connection_class.include?("mysql")
         MySQL
-      elsif connection_class.include?("monetdb")
-        MonetDB
       else
-        raise NotImplementedError
+        raise NotImplementedError, "Connection type not supported"
       end
     end
 

data/lib/directive_record/query/sql.rb

@@ -64,12 +64,12 @@ module DirectiveRecord
       end
 
       def validate_options!(options)
-        options.assert_valid_keys :select, :where, :group_by, :order_by, :limit, :offset, :aggregates, :numerize_aliases
+        options.assert_valid_keys :select, :where, :group_by, :order_by, :limit, :offset, :aggregates, :numerize_aliases, :optimize
       end
 
       def optimize_query!(options)
         select = [options[:select]].flatten
-        if options[:where] && (select != %w(id)) && select.any?{|x| x.match(/^\w+(\.\w+)+$/)}
+        if options[:optimize] && (select != %w(id)) && select.any?{|x| x.match(/^\w+(\.\w+)+$/)}
           ids = base.connection.select_values(to_sql(options.merge(:select => "id"))).uniq + [0]
           options[:where] = ["id IN (#{ids.join(", ")})"]
           options.delete :limit

data/lib/directive_record/version.rb

@@ -1,7 +1,7 @@
 module DirectiveRecord
   MAJOR = 0
   MINOR = 1
-  TINY  = 0
+  TINY  = 1
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

data/test/unit/query/test_mysql.rb

@@ -217,7 +217,7 @@ module Unit
                 ORDER BY `office`.city, `e`.last_name, `e`.first_name
               }
             ),
-            Employee.to_qry("id", "office.city", :where => "office_id = 1", :order_by => "office.city, last_name, first_name")
+            Employee.to_qry("id", "office.city", :where => "office_id = 1", :order_by => "office.city, last_name, first_name", :optimize => true)
           )
 
           assert_equal(

data/test/unit/test_query.rb

@@ -20,12 +20,6 @@ module Unit
           end
         end
 
-        describe "when MonetDB" do
-          it "returns the DirectiveRecord::Query::MonetDB class" do
-            assert_equal DirectiveRecord::Query::MonetDB, DirectiveRecord::Query.send(:class_for, "monetdb::connection")
-          end
-        end
-
         describe "when else" do
           it "raises a NotImplementedError" do
             assert_raises NotImplementedError do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directiverecord
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -143,7 +143,6 @@ files:
 - lib/directive_record/gem_ext/active_record/base.rb
 - lib/directive_record/gem_ext/active_record/relation.rb
 - lib/directive_record/query.rb
-- lib/directive_record/query/monetdb.rb
 - lib/directive_record/query/mysql.rb
 - lib/directive_record/query/sql.rb
 - lib/directive_record/relation.rb
@@ -165,7 +164,6 @@ files:
 - test/test_helper/coverage.rb
 - test/unit/gem_ext/active_record/test_base.rb
 - test/unit/gem_ext/active_record/test_relation.rb
-- test/unit/query/test_monetdb.rb
 - test/unit/query/test_mysql.rb
 - test/unit/query/test_sql.rb
 - test/unit/test_directive_record.rb
@@ -212,7 +210,6 @@ test_files:
 - test/test_helper/coverage.rb
 - test/unit/gem_ext/active_record/test_base.rb
 - test/unit/gem_ext/active_record/test_relation.rb
-- test/unit/query/test_monetdb.rb
 - test/unit/query/test_mysql.rb
 - test/unit/query/test_sql.rb
 - test/unit/test_directive_record.rb

data/lib/directive_record/query/monetdb.rb

@@ -1,54 +0,0 @@
-module DirectiveRecord
-  module Query
-    class MonetDB < SQL
-
-    private
-
-      def path_delimiter
-        "__"
-      end
-
-      def aggregate_delimiter
-        "__"
-      end
-
-      def group_by_all_sql
-        "all_rows"
-      end
-
-      def prepare_options!(options)
-        normalize_group_by! options
-        [:select, :where, :having, :group_by, :order_by].each do |key|
-          if options[key]
-            base.reflections.keys.each do |association|
-              options[key] = [options[key]].flatten.collect{|x| x.gsub(/^#{association}\.([a-z_\.]+)/) { "#{association}_#{$1.gsub(".", "_")}" }}
-            end
-          end
-        end
-      end
-
-      def finalize_options!(options)
-        if options[:having]
-          if options[:numerize_aliases]
-            map = Hash[options[:select].scan(/,?\s?(.*?) AS ([^,]+)/).collect(&:reverse)]
-            options[:aliases].each{|pattern, replacement| options[:having].gsub! pattern, map[replacement]}
-          else
-            (options[:aggregates] || {}).each do |path, aggregate|
-              options[:having].gsub! /\b#{aggregate}__#{path}\b/, "#{aggregate.to_s.upcase}(#{path})"
-            end
-          end
-        end
-
-        options[:select] = options[:select].split(", ").collect do |string|
-          expression, query_alias = string.match(/^(.*) AS (.*)$/).try(:captures)
-          if query_alias
-            options[:group_by].to_s.include?(expression) || !expression.match(/^\w+(\.\w+)*$/) ? string : "MAX(#{expression}) AS #{query_alias}"
-          else
-            string.match(/^\w+(\.\w+)*$/) ? "MAX(#{string})" : string
-          end
-        end.join(", ") if options[:group_by]
-      end
-
-    end
-  end
-end

data/test/unit/query/test_monetdb.rb

@@ -1,27 +0,0 @@
-require_relative "../../test_helper"
-
-module Unit
-  module Query
-    class TestMonetDB < MiniTest::Test
-
-      describe DirectiveRecord::Query::MonetDB do
-        before do
-          DirectiveRecord::Query.expects(:class_for).returns(DirectiveRecord::Query::MonetDB).at_least_once
-        end
-
-        it "generates the expected SQL" do
-          assert_equal(
-            strip(
-              %Q{
-                SELECT o.id, o.city
-                FROM offices o
-              }
-            ),
-            Office.to_qry("id, city")
-          )
-        end
-      end
-
-    end
-  end
-end