directiverecord 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjcwZWZhNjNhZThlMWQyOWU4NGIyNzE1YTRiNjQ5N2UzYWE2OGUzYQ==
+    N2MxYzVmZWI5YjQxYWI0YjMwZTY2NDQzNWQwN2RiZTk4YzU4YjYxMQ==
   data.tar.gz: !binary |-
-    NjcxNWM5NTc2NzEzZTNiNTUwNjczMTA4MjAzMzUwMGViMTYzMjRlNA==
+    OGNkNWI1NTdiMDg4MGNkZWU1MjBkNTAwMDg5Zjg1OGUzOGE4NzI4ZQ==
 SHA512:
   metadata.gz: !binary |-
-    NGFkZTNiN2EyN2NhZTc4YjE0ZjY2MjE0M2EwMGZiYjc2OGZjODk4OTE5MjZm
-    ZTIzZWQ3ZTRjODU3YWYxMDhmOTJiNTgwMWM1ODZmZWM3OTc1YzQ4YTczZjVi
-    Y2M3YWRiYjYxZTllNzIxMzU4MzFlMzQ3MDBiMTllNzMwYjdiNjY=
+    NmI5MGE4ZDBhNDNkZDYzMmU2ZTkzNmZmNTA1NDZlZjhmMDg2OGY4OGQ0ODk4
+    YTA1NGE1NGNkYjExYTM5OTkzNTA2NmU2ZTYyODVhMmQ3MjhkMGUxNDUzNTJj
+    ZjUxYWE0ZmEyMzA3MzZhYjgyZWM5NThkMmQwZjlkYjMzYmE0ZDM=
   data.tar.gz: !binary |-
-    MDhmZWNlZDY2Njc1OWM4ZjM4NzkxMWI3ODhmMTJjZDU5NmM2MDU5M2YxNWJj
-    Y2Y5YWI4MGJhNTRmOTI1MWU5ZTc0M2Y3Y2VjMzUyNjBjOTk4Y2FjMjA2MTUz
-    OTU4NzE2M2E2YmM3YTA4OTZlOGIwMDBlYzdiMGM2MGYyMDk1MWQ=
+    Y2UwZGM3YTA2NDdmYTAzNTg5Yzk3Y2FmOTZiZTMzYzhlOTM0OTczZGM1ODg2
+    YTRiZThhODFiOTA4NDBmMWYyYzdhNDc2Mjg2NjRiODE3MDVmYmM1YjlkYzI3
+    NzQ2YmMyNDZmNDgzMjE5NGZjMjk4ZjJlN2U1NTFkYmRiZjYwYzI=

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.4 (January 22, 2015)
+
+* Improved partitioning conditions to WHERE or HAVING which fixes conditions with non-aggregate functions (e.g. LOWER)
+
 == Version 0.1.3 (January 21, 2015)
 
 * Added trend query support

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/directive_record/query/sql.rb

@@ -155,6 +155,11 @@ SQL
             sql = sql.gsub(/ AS .*$/, "")
             sql_alias = options[:aliases][prepend_base_alias(sql_alias || sql)] = "c#{array.size + 1}"
           end
+          unless sql_alias
+            sql.match(/^(.*) AS (.*)$/)
+            sql = $1 if $1
+            sql_alias = $2
+          end
 
           options[:aliases][sql] = sql_alias if sql_alias
 
@@ -168,14 +173,16 @@ SQL
       end
 
       def normalize_where!(options)
-        regexp = /^\S+/
+        regexp, aliases = /^\S+/, options[:aliases].invert
 
         where, having = (options[:where] || []).partition do |statement|
-          !options[:aggregated].keys.include?(statement.strip.match(regexp).to_s) &&
-          statement.downcase.gsub(/((?<![\\])['"])((?:.(?!(?<![\\])\1))*.?)\1/, " ")
-                            .scan(/([a-zA-Z_\.]+)?\s*(=|<=>|>=|>|<=|<|<>|!=|is|like|rlike|regexp|in|between|not|sounds|soundex)(\b|\s)/)
-                            .all? do |(path, operator)|
-            path && column_for(path)
+          statement.gsub(/((?<![\\])['"])((?:.(?!(?<![\\])\1))*.?)\1/, " ")
+                   .split(/\b(and|or)\b/i).reject{|sql| %w(and or).include? sql.downcase}
+                   .collect{|sql| sql = sql.strip; (sql[0] == "(" && sql[-1] == ")" ? sql[1..-1] : sql)}
+                   .all? do |sql|
+            sql.match /(.*)\s*(=|<=>|>=|>|<=|<|<>|!=|is|like|rlike|regexp|in|between|not|sounds|soundex)(\b|\s|$)/i
+            path = $1.strip rescue binding.pry
+            !(aliases[path] || path).match(/\b(count|sum|min|max|avg)\(/i)
           end
         end
 

data/lib/directive_record/version.rb

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

data/test/unit/query/test_mysql.rb

@@ -55,7 +55,7 @@ module Unit
                 LIMIT 5
               }
             ),
-            Customer.to_qry("id, name, COUNT(orders.id) AS order_count, GROUP_CONCAT(DISTINCT tags.name) AS tags", :group_by => "id", :order_by => "COUNT(DISTINCT tags.id) DESC", :limit => 5)
+            Customer.to_qry("id", "name", "COUNT(orders.id) AS order_count", "GROUP_CONCAT(DISTINCT tags.name) AS tags", :group_by => "id", :order_by => "COUNT(DISTINCT tags.id) DESC", :limit => 5)
           )
 
           assert_equal(
@@ -97,7 +97,7 @@ module Unit
                 ORDER BY `c`.id
               }
             ),
-            Customer.to_qry("id, name, COUNT(orders.id) AS order_count", :where => "order_count > 3", :group_by => "id")
+            Customer.to_qry("id", "name", "COUNT(orders.id) AS order_count", :where => "order_count > 3", :group_by => "id")
           )
 
           $default_office_scope = {:id => [1, 3, 6]}
@@ -195,6 +195,17 @@ module Unit
             Employee.where(["first_name LIKE ?", "%y"]).to_qry
           )
 
+          assert_equal(
+            strip(
+              %Q{
+                SELECT `e`.*
+                FROM employees `e`
+                WHERE (LOWER(`e`.first_name) LIKE '%y')
+              }
+            ),
+            Employee.where(["LOWER(first_name) LIKE ?", "%y"]).to_qry
+          )
+
           assert_equal(
             strip(
               %Q{

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directiverecord
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord