orientdb 0.0.14-jruby → 0.0.15-jruby

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15

data/lib/orientdb/sql/common.rb

@@ -1,4 +1,5 @@
 module OrientDB::SQL
+
   module UtilsMixin
 
     def select_single_string(arg)
@@ -19,6 +20,10 @@ module OrientDB::SQL
           "[" + value.map { |x| quote(x) }.join(", ") + "]"
         when Regexp
           quote_regexp(value)
+        when OrientDB::SQL::LiteralExpression
+          value.to_s
+        else
+          quote value.to_s
       end
     end
 
@@ -170,6 +175,24 @@ module OrientDB::SQL
 
   end
 
+  class LiteralExpression
+
+    def initialize(value)
+      @value = value.to_s
+    end
+
+    def to_s
+      @value
+    end
+
+    include Comparable
+
+    def <=>(other)
+      to_s <=> other.to_s
+    end
+
+  end
+
   class ConditionExpression
 
     attr_reader :conditions
@@ -213,5 +236,12 @@ module OrientDB::SQL
     def to_s
       "#{type} #{parens_conditions_str} "
     end
+
+    include Comparable
+
+    def <=>(other)
+      to_s <=> other.to_s
+    end
   end
+
 end

data/lib/orientdb/sql/ext.rb

@@ -61,6 +61,10 @@ module OrientDB
     module ConditionalExtension
       include OrientDB::SQL::UtilsMixin
 
+      def lit
+        OrientDB::SQL::LiteralExpression.new to_s
+      end
+
       def like(value)
         "#{to_s} LIKE #{quote(value)}"
       end

data/orientdb.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{orientdb}
-  s.version = "0.0.14"
+  s.version = "0.0.15"
   s.platform = %q{jruby}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Madrid"]
-  s.date = %q{2011-01-25}
+  s.date = %q{2011-01-26}
   s.default_executable = %q{orientdb_console}
   s.description = %q{Simple JRuby wrapper for the OrientDB.}
   s.email = ["aemadrid@gmail.com"]
@@ -51,7 +51,6 @@ Gem::Specification.new do |s|
     "lib/orientdb/sql/insert.rb",
     "lib/orientdb/sql/query.rb",
     "lib/orientdb/sql/update.rb",
-    "lib/orientdb/sql_query.rb",
     "lib/orientdb/storage.rb",
     "lib/orientdb/user.rb",
     "lib/orientdb/version.rb",

data/spec/database_spec.rb

@@ -9,14 +9,14 @@ describe "OrientDB" do
     end
 
     it "should create a valid simple table" do
-      exp_class = "#<OrientDB::OClass:person name=#<orientdb::schematype:string>>"
+      exp_class = "#<OrientDB::OClass:person name=STRING>"
       exp_props = ["#<OrientDB::Propery:name type=string indexed=false mandatory=false not_null=false>"]
       @person_class.to_s.should == exp_class
       @person_class.properties.map { |x| x.to_s }.should == exp_props
     end
 
     it "should create a valid simple descendant table" do
-      exp_class = "#<OrientDB::OClass:customer super=person tab=#<orientdb::schematype:float> name=#<orientdb::schematype:string>>"
+      exp_class = "#<OrientDB::OClass:customer super=person tab=FLOAT name=STRING>"
       exp_props = [
         "#<OrientDB::Propery:tab type=decimal indexed=false mandatory=false not_null=false>",
         "#<OrientDB::Propery:name type=string indexed=false mandatory=false not_null=false>"
@@ -26,7 +26,7 @@ describe "OrientDB" do
     end
 
     it "should create a complex table" do
-      exp_class = "#<OrientDB::OClass:invoice number=#<orientdb::schematype:integer>(idx) customer=#<orientdb::schematype:link> sold_on=#<orientdb::schematype:date> total=#<orientdb::schematype:float> lines=#<orientdb::schematype:linklist>>"
+      exp_class = "#<OrientDB::OClass:invoice number=INTEGER(idx) customer=LINK sold_on=DATE total=FLOAT lines=LINKLIST>"
       exp_props = [
         "#<OrientDB::Propery:number type=int indexed=true mandatory=true not_null=false>",
         "#<OrientDB::Propery:customer type=link indexed=false mandatory=false not_null=true>",

data/spec/sql_spec.rb

@@ -41,6 +41,13 @@ describe "OrientDB" do
           OrientDB::SQL::Query.quote(:@size).should == "@size"
           OrientDB::SQL::Query.quote(:@type).should == "@type"
         end
+
+        it "should quote literal_expressions properly" do
+          value = OrientDB::SQL::LiteralExpression.new "@this"
+          OrientDB::SQL::Query.quote(:@this).should == "@this"
+          value = OrientDB::SQL::LiteralExpression.new :@this
+          OrientDB::SQL::Query.quote(:@this).should == "@this"
+        end
       end
 
       describe "select_single_string" do
@@ -342,6 +349,10 @@ describe "OrientDB" do
           end
 
           describe "Conditional" do
+            it "should work" do
+              :name.lit.should == OrientDB::SQL::LiteralExpression.new("name")
+            end
+
             it "#like should work" do
               :name.like("test%").should == "name LIKE 'test%'"
             end
@@ -524,6 +535,10 @@ describe "OrientDB" do
           end
 
           describe "Conditional" do
+            it "should work" do
+              'name'.lit.should == OrientDB::SQL::LiteralExpression.new("name")
+            end
+
             it "#like should work" do
               'name'.like("test%").should == "name LIKE 'test%'"
             end

metadata

@@ -2,7 +2,7 @@
 name: orientdb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.14
+  version: 0.0.15
 platform: jruby
 authors: 
   - Adrian Madrid
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 -07:00
+date: 2011-01-26 00:00:00 -07:00
 default_executable: orientdb_console
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -77,7 +77,6 @@ files:
   - lib/orientdb/sql/insert.rb
   - lib/orientdb/sql/query.rb
   - lib/orientdb/sql/update.rb
-  - lib/orientdb/sql_query.rb
   - lib/orientdb/storage.rb
   - lib/orientdb/user.rb
   - lib/orientdb/version.rb