dm-sql-finders 0.0.1 → 0.0.2

data/lib/data_mapper/sql_finders/adapter.rb

@@ -1,7 +1,10 @@
 module DataMapper
   class Adapters::DataObjectsAdapter
-    def select_statement(query)
+    def select_statement_with_query(query)
       SQLFinders::SQLBuilder.new(self, query).select_statement
     end
+
+    alias_method :select_statement_without_query, :select_statement
+    alias_method :select_statement, :select_statement_with_query
   end
 end

data/lib/data_mapper/sql_finders/sql_builder.rb

@@ -20,6 +20,8 @@ module DataMapper
       end
 
       def select_statement
+        return @adapter.send(:select_statement_without_query, @query) unless @query.kind_of?(SQLFinders::Query)
+
         statement = [
           columns_fragment,
           from_fragment,

data/lib/data_mapper/sql_finders/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module SQLFinders
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/spec/public/adapter_spec.rb

@@ -1,12 +1,26 @@
 require "spec_helper"
 
 describe DataMapper::Adapters::DataObjectsAdapter do
-  context "querying by SQL" do
+  before(:each) do
+    @bob  = User.create(:username => "Bob",  :role => "Manager")
+    @fred = User.create(:username => "Fred", :role => "Tea Boy")
+  end
+
+  context "query without SQL" do
     before(:each) do
-      @bob  = User.create(:username => "Bob",  :role => "Manager")
-      @fred = User.create(:username => "Fred", :role => "Tea Boy")
+      @users = User.all(:username => "Bob")
+      @sql, @bind_values = User.repository.adapter.send(:select_statement, @users.query)
     end
 
+    it "behaves unchanged" do
+      @users.to_a.count.should == 1
+      @users.to_a.first.should == @bob
+      @sql.should == %{SELECT "id", "username", "role" FROM "users" WHERE "username" = ? ORDER BY "id"}
+      @bind_values.should == ["Bob"]
+    end
+  end
+
+  context "querying by SQL" do
     context "with a basic SELECT statement" do
       before(:each) do
         @users = User.by_sql { |u| ["SELECT #{u.*} FROM #{u} WHERE #{u.role} = ?", "Manager"] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-sql-finders
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
-  requirement: &6758340 !ruby/object:Gem::Requirement
+  requirement: &13789500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *6758340
+  version_requirements: *13789500
 - !ruby/object:Gem::Dependency
   name: dm-do-adapter
-  requirement: &6757000 !ruby/object:Gem::Requirement
+  requirement: &13785560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *6757000
+  version_requirements: *13785560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &6755440 !ruby/object:Gem::Requirement
+  requirement: &13783660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *6755440
+  version_requirements: *13783660
 - !ruby/object:Gem::Dependency
   name: dm-migrations
-  requirement: &6754500 !ruby/object:Gem::Requirement
+  requirement: &13782460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *6754500
+  version_requirements: *13782460
 - !ruby/object:Gem::Dependency
   name: dm-aggregates
-  requirement: &6753640 !ruby/object:Gem::Requirement
+  requirement: &13779440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *6753640
+  version_requirements: *13779440
 - !ruby/object:Gem::Dependency
   name: dm-sqlite-adapter
-  requirement: &6752280 !ruby/object:Gem::Requirement
+  requirement: &13778640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *6752280
+  version_requirements: *13778640
 description: ! "dm-sql-finders add #by_sql to your DataMapper models and provides
   a clean mechanism for using\n                     the names of the properties in
   your model, instead of the actual fields in the database. Any SQL\n                     is