sessionm-cassandra_object 4.0.11 → 4.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e09d42c44da63c37887407613d4abfab560b4ba
-  data.tar.gz: d712eee439e1832cee073e0829b235016b1248ff
+  metadata.gz: 11fade06487e64fb440faa12d842abf5dd28ec69
+  data.tar.gz: d39185eda954f6d24cb700fba070147da68034e0
 SHA512:
-  metadata.gz: 2a72f143c68b66fb4b29f88968504e50ad361af01d22c40316047142863ec87136bb0402ad570d59a36851151d7e6e84066e7dd0eaf0cd350fc23abb484f4c1d
-  data.tar.gz: 617502c23d8ecb0f42b07f423ebfa180ec4d228e5f4a3ae48cd73b39895dc534decf3edc4fa79d5aabdb4b1097e8304cec787d63b1ea88b38ae888c1d6d73d45
+  metadata.gz: 87ff41502c07a90dd515e8a05d90f0c663c916e074fcdb4a0fe65af3bf5302fa9f646d4d24b30e4bfac00ea2add30ba537e4e5b8ac29f82bbe1f035e69c2cb2b
+  data.tar.gz: d47225dcaf82c9cf890f67f541f3b376adb88dbf8358d74c72d01a0e6522196da10092c4e33a92bb5c50e8d2fdd9e4beb366046be509226abd063af3e0fb6b63

data/lib/cassandra_object/adapters/cassandra_driver.rb

@@ -75,7 +75,7 @@ module CassandraObject
 
           query = "BEGIN BATCH\n"
           query << values.map do |name, value|
-            "  INSERT INTO \"#{column_family}\" (#{KEY_FIELD}, #{NAME_FIELD}, #{VALUE_FIELD}) VALUES (#{key}, #{escape(name, opts.try(:[], :name_type))}, #{escape(value, opts.try(:[], :value_type))})#{insert_into_options}"
+            "  INSERT INTO \"#{column_family}\" (#{KEY_FIELD}, #{NAME_FIELD}, #{VALUE_FIELD}) VALUES (#{key}, #{escape(name, name_type(column_family))}, #{escape(value, value_type(column_family))})#{insert_into_options}"
           end.join("\n")
           query << "\nAPPLY BATCH;"
 
@@ -177,10 +177,10 @@ module CassandraObject
           key = "textAsBlob('#{key}')"
 
           query = "SELECT * FROM \"#{column_family}\" WHERE #{KEY_FIELD} = #{key}"
-          query << " AND #{NAME_FIELD} = #{escape(column, opts[:name_type])}" if column
-          query << " AND #{NAME_FIELD} >= #{escape(start, opts[:name_type])}" unless start.empty?
-          query << " AND #{NAME_FIELD} <= #{escape(finish, opts[:name_type])}" unless finish.empty?
-          query << " ORDER BY #{NAME_FIELD} #{opts[:reverse_comparator] ? 'ASC' : 'DESC'}" if reversed
+          query << " AND #{NAME_FIELD} = #{escape(column, name_type(column_family))}" if column
+          query << " AND #{NAME_FIELD} >= #{escape(start, name_type(column_family))}" unless start.empty?
+          query << " AND #{NAME_FIELD} <= #{escape(finish, name_type(column_family))}" unless finish.empty?
+          query << " ORDER BY #{NAME_FIELD} #{reverse_comparator(column_family) ? 'ASC' : 'DESC'}" if reversed
           query << " LIMIT #{count}"
 
           self.execute(query, execute_options(opts)).inject({}) do |results, row|
@@ -243,6 +243,18 @@ CQL
           self.column_families[column_family.name.to_s] = column_family
         end
 
+        def name_type(column_family)
+          self.cluster.keyspace(keyspace).table(column_family).column(NAME_FIELD).type.kind
+        end
+
+        def value_type(column_family)
+          self.cluster.keyspace(keyspace).table(column_family).column(VALUE_FIELD).type.kind
+        end
+
+        def reverse_comparator(column_family)
+          self.cluster.keyspace(keyspace).table(column_family).send(:clustering_order).first == :desc
+        end
+
         def escape(str, type)
           case type
           when :timeuuid

data/sessionm-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'sessionm-cassandra_object'
-  s.version = '4.0.11'
+  s.version = '4.0.12'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sessionm-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.0.11
+  version: 4.0.12
 platform: ruby
 authors:
 - Doug Youch