activerecord-simpledb-adapter 0.1.0 → 0.1.1

data/README.md

@@ -23,6 +23,10 @@ config/database.yml:
 	  <<: *defaults
 	  domain_name: domain_name
 
+for creating domain:
+    
+	rake db:create
+
 model example:
     Person < ActiveRecord::Base
 	  columns_definition do |t|

data/activerecord-simpledb-adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-simpledb-adapter}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilia Ablamonov", "Alex Gorkunov", "Cloud Castle Inc."]
-  s.date = %q{2011-01-14}
+  s.date = %q{2011-01-17}
   s.email = %q{ilia@flamefork.ru}
   s.extra_rdoc_files = [
     "LICENSE.txt",

data/lib/active_record/connection_adapters/simpledb_adapter.rb

@@ -128,7 +128,7 @@ module ActiveRecord
       def mount_sql_and_params(klass, table_name, attribute, value) #:nodoc:
         column = klass.columns_hash[attribute.to_s]
 
-        sql_attribute = "#{table_name}.#{klass.connection.quote_column_name(column.db_column_name)}"
+        sql_attribute = "#{klass.connection.quote_column_name(column.db_column_name)}"
         sql = "#{sql_attribute} = ?"
         if value.nil?
           [sql, [value]]
@@ -191,6 +191,8 @@ module ActiveRecord
       end
 
       def unquote_number value
+        return nil if value.nil?
+
         case sql_type
           when :integer then
             value.to_i - number_shift
@@ -275,6 +277,14 @@ module ActiveRecord
           super
         end
       end
+
+      def quote_column_name(column_name)
+        "`#{column_name}`"
+      end
+      
+      def quote_table_name(table_name)
+        table_name
+      end
       #=======================================
 
       attr_reader :domain_name
@@ -398,7 +408,7 @@ module ActiveRecord
       end
 
       def get_collection_column_and_name sql
-        if sql.match /(#{@@ccn.values.join("|")})\s*=\s*'(.*?)'/
+        if sql.match /`?(#{@@ccn.values.join("|")})`?\s*=\s*'(.*?)'/
           $2
         else
           raise  PreparedStatementInvalid, "collection column '#{@@ccn.values.join(" or ")}' not found in the WHERE section in query"

data/lib/arel/visitors/simpledb.rb

@@ -40,7 +40,7 @@ module Arel
           o.cores.first.wheres << SqlLiteral.new("#{attr} IS NOT NULL")
         end
         collection = o.cores.first.froms.name
-        o.cores.first.wheres << SqlLiteral.new("#{@connection.collection_column_name(collection)} = #{quote(collection)}")
+        o.cores.first.wheres << SqlLiteral.new("`#{@connection.collection_column_name(collection)}` = #{quote(collection)}")
         o.cores.first.froms = Table.new @connection.domain_name
         super
       end
@@ -63,12 +63,14 @@ module Arel
       
       def visit_Arel_Nodes_Assignment o
         right = o.right ? hash_value_quote(o.right, o.left.column) : nil
-        {visit(o.left) => right}
+        left = o.left.column.name
+        {left => right}
       end
 
       def visit_Arel_Nodes_Equality o
         right = o.right ? hash_value_quote(o.right, o.left.column) : nil
-        {visit(o.left) => right}.tap { |m|
+        left = o.left.column.name
+        {left => right}.tap { |m|
           m.override_to_s "#{visit o.left} = #{quote(o.right, o.left.column)}"
         }
       end
@@ -92,8 +94,7 @@ module Arel
       def visit_Arel_Nodes_SqlLiteral o
         # Strip table name from table.column -like literals
         result = o.to_s.gsub(/\w+\.([\w*]+)/, '\1')
-        
-        if result.match /(\w+)\s*=\s*'(.*?)'/
+        if result.match /`(\w+)`\s*=\s*'(.*?)'/
           # transform 'a = b' to {'a' => 'b'}
           {$1 => $2}.tap {|m| m.override_to_s result}
         else

data/spec/activerecord-simpledb-adapter_spec.rb

@@ -138,4 +138,12 @@ describe "model with active_record_simple_db" do
     p = Person.where(:year => 2010).all
     p.should_not be_empty
   end
+
+  it "should be correct work with where statment with \"from\" column" do
+    p1 = Person.new
+    p1.from = 'test'
+    p1.save
+    p = Person.where(:from => 'test').all
+    p.should_not be_empty
+  end
 end

data/spec/spec_helper.rb

@@ -38,7 +38,7 @@ class Person < ActiveRecord::Base
     t.string :login
     t.integer :year, :limit => 4
     t.boolean :active
-    t.string :state
+    t.string :from
     t.float :price
     t.integer :lock_version
 
@@ -51,7 +51,7 @@ class Person < ActiveRecord::Base
         :year => 2010,
         :active => true,
         :price => 10.04,
-        :state => 'paid'
+        :from => 'paid'
     }
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-simpledb-adapter
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ilia Ablamonov
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 +03:00
+date: 2011-01-17 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency