hyperion-sql 0.1.3 → 0.2.0

data/lib/hyperion/sql/datastore.rb

@@ -66,12 +66,16 @@ module Hyperion
       end
 
       def pack_key(kind, key)
-        table, id = Key.decompose_key(key)
-        id
+        if key
+          table, id = Key.decompose_key(key)
+          id
+        end
       end
 
       def unpack_key(kind, key)
-        Key.compose_key(kind, key)
+        if key
+          Key.compose_key(kind, key)
+        end
       end
 
       private

data/lib/hyperion/sql/query_builder.rb

@@ -80,21 +80,33 @@ module Hyperion
           filter_sql = []
           filter_values = []
           filters.each do |filter|
-            filter_sql << "#{format_column(filter.field)} #{format_operator(filter.operator)} ?"
-            filter_values << filter.value
+            apply_filter(filter, filter_sql, filter_values)
           end
           sql_query.append("WHERE #{filter_sql.join(' AND ')}", filter_values)
         end
       end
 
-      def format_operator(operator)
-        case operator
-        when 'contains?'
-          "IN"
-        when '!='
-          "<>"
+      def apply_filter(filter, filter_sql, filter_values)
+        column = format_column(filter.field)
+        if filter.operator == '!='
+          if filter.value.nil?
+            filter_sql << "#{column} IS NOT NULL"
+          else
+            filter_sql << "(#{column} != ? OR #{column} IS NULL)"
+            filter_values << filter.value
+          end
+        elsif filter.operator == 'contains?'
+          if filter.value.include?(nil)
+            filter_sql << "(#{column} IN ? OR #{column} IS NULL)"
+          else
+            filter_sql << "#{column} IN ?"
+          end
+          filter_values << filter.value
+        elsif filter.operator == '=' && filter.value.nil?
+          filter_sql << "#{column} IS NULL"
         else
-          operator
+          filter_sql << "#{column} #{filter.operator} ?"
+          filter_values << filter.value
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyperion-sql
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,23 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.3
-- !ruby/object:Gem::Dependency
-  name: uuidtools
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: do_sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +50,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.8
+        version: 0.10.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.8
+        version: 0.10.10
 description: Shared behavior for Sql databases
 email:
 - myles@8thlight.com