sequel 0.1.9.8 → 0.1.9.9

data/CHANGELOG

@@ -1,3 +1,11 @@
+=== 0.1.9.9 (2007-08-18)
+
+* New ADO adapter by cdcarter (#31).
+
+* Added automatic column aliasing to #avg, #sum, #min and #max (#30).
+
+* Fixed broken Sequel::DBI::Dataset#fetch_rows (#29 thanks cdcarter.)
+
 === 0.1.9.8 (2007-08-15)
 
 * Fixed DBI adapter.

data/Rakefile

@@ -6,7 +6,7 @@ require 'fileutils'
 include FileUtils
 
 NAME = "sequel"
-VERS = "0.1.9.8"
+VERS = "0.1.9.9"
 CLEAN.include ['**/.*.sw?', 'pkg/*', '.config', 'doc/*', 'coverage/*']
 RDOC_OPTS = ['--quiet', '--title', "Sequel: Concise ORM for Ruby",
   "--opname", "index.html",

data/lib/sequel/ado.rb

@@ -0,0 +1,74 @@
+if !Object.const_defined?('Sequel')
+  require File.join(File.dirname(__FILE__), '../sequel')
+end
+
+require 'win32ole'
+
+module Sequel
+  module ADO
+    class Database < Sequel::Database
+      set_adapter_scheme :ado
+      
+      def connect
+        dbname = @opts[:database]
+        handle = WIN32OLE.new('ADODB.Connection')
+        handle.Open(dbname)
+        handle
+      end
+    
+      def dataset(opts = nil)
+        ADO::Dataset.new(self, opts)
+      end
+    
+      def execute(sql)
+        @logger.info(sql) if @logger
+        @pool.hold {|conn| conn.Execute(sql)}
+      end
+      
+      alias_method :do, :execute
+    end
+    
+    class Dataset < Sequel::Dataset
+      def literal(v)
+        case v
+        when Time: literal(v.iso8601)
+        else
+          super
+        end
+      end
+
+      def fetch_rows(sql, &block)
+        @db.synchronize do
+          s = @db.execute sql
+          
+          num_cols = s.Fields.Count
+          @columns = Array.new(num_cols)
+          0.upto(num_cols-1) {|x| @columns[x] = s.Fields(x).Name.to_sym}
+          
+          s.getRows.transpose.each {|r| yield hash_row(r) }
+        end
+        self
+      end
+      
+      def hash_row(row)
+        @columns.inject({}) do |m, c|
+          m[c] = row.shift
+          m
+        end
+      end
+    
+      def insert(*values)
+        @db.do insert_sql(*values)
+      end
+    
+      def update(values, opts = nil)
+        @db.do update_sql(values, opts)
+        self
+      end
+    
+      def delete(opts = nil)
+        @db.do delete_sql(opts)
+      end
+    end
+  end
+end

data/lib/sequel/core_ext.rb

@@ -43,10 +43,13 @@ class String
   def to_time
     Time.parse(self)
   end
+  
+  def to_field_name
+    self
+  end
 end
 
-# Symbol extensions
-class Symbol
+module FieldCompositionMethods
   def DESC
     "#{to_field_name} DESC"
   end
@@ -55,12 +58,40 @@ class Symbol
     "#{to_field_name} AS #{target}"
   end
 
+  def ALL
+    "#{to_s}.*"
+  end
+  
+  FIELD_TITLE_RE1 = /^(.*)\sAS\s(.+)$/.freeze
+  FIELD_TITLE_RE2 = /^([^\.]+)\.([^\.]+)$/.freeze
+  
+  def field_title
+    s = to_field_name
+    case s
+    when FIELD_TITLE_RE1, FIELD_TITLE_RE2: $2
+    else
+      s
+    end
+  end
+
+  def MIN; "min(#{to_field_name})"; end
+  def MAX; "max(#{to_field_name})"; end
+  def SUM; "sum(#{to_field_name})"; end
+  def AVG; "avg(#{to_field_name})"; end
+end
+
+class String
+  include FieldCompositionMethods
+end
+
+# Symbol extensions
+class Symbol
+  include FieldCompositionMethods
+  
+
   FIELD_REF_RE1 = /^([a-z_]+)__([a-z_]+)___([a-z_]+)/.freeze
   FIELD_REF_RE2 = /^([a-z_]+)___([a-z_]+)$/.freeze
   FIELD_REF_RE3 = /^([a-z_]+)__([a-z_]+)$/.freeze
-  DOUBLE_UNDERSCORE = '__'.freeze
-  PERIOD = '.'.freeze
-  
   def to_field_name
     s = to_s
     case s
@@ -71,13 +102,6 @@ class Symbol
       s
     end
   end
-  
-  def ALL
-    "#{to_s}.*"
-  end
-
-  def MIN; "min(#{to_field_name})"; end
-  def MAX; "max(#{to_field_name})"; end
-  def SUM; "sum(#{to_field_name})"; end
-  def AVG; "avg(#{to_field_name})"; end
 end
+
+

data/lib/sequel/dataset/dataset_convenience.rb

@@ -131,22 +131,22 @@ module Sequel
 
       # Returns the minimum value for the given field.
       def min(field)
-        single_value(:select => [field.MIN])
+        single_value(:select => [field.MIN.AS(:v)])
       end
 
       # Returns the maximum value for the given field.
       def max(field)
-        single_value(:select => [field.MAX])
+        single_value(:select => [field.MAX.AS(:v)])
       end
 
       # Returns the sum for the given field.
       def sum(field)
-        single_value(:select => [field.SUM])
+        single_value(:select => [field.SUM.AS(:v)])
       end
 
       # Returns the average value for the given field.
       def avg(field)
-        single_value(:select => [field.AVG])
+        single_value(:select => [field.AVG.AS(:v)])
       end
 
       # Pretty prints the records in the dataset as plain-text table.

data/lib/sequel/dbi.rb

@@ -47,7 +47,7 @@ module Sequel
         @db.synchronize do
           s = @db.execute sql
           begin
-            @columns = stmt.column_names.map {|c| c.to_sym}
+            @columns = s.column_names.map {|c| c.to_sym}
             s.fetch {|r| yield hash_row(s, r)}
           ensure
             s.finish rescue nil

data/spec/adapters/sqlite_spec.rb

@@ -113,4 +113,30 @@ context "An SQLite dataset" do
     @d.count.should == 1
     @d.first[:name].should == 'def'
   end
+end
+
+context "An SQLITE dataset" do
+  setup do
+    @d = SQLITE_DB[:items]
+    @d.delete # remove all records
+    @d << {:name => 'abc', :value => 1.23}
+    @d << {:name => 'def', :value => 4.56}
+    @d << {:name => 'ghi', :value => 7.89}
+  end
+  
+  specify "should correctly return avg" do
+    @d.avg(:value).should == ((1.23 + 4.56 + 7.89) / 3).to_s
+  end
+  
+  specify "should correctly return sum" do
+    @d.sum(:value).should == (1.23 + 4.56 + 7.89).to_s
+  end
+  
+  specify "should correctly return max" do
+    @d.max(:value).should == 7.89.to_s
+  end
+  
+  specify "should correctly return min" do
+    @d.min(:value).should == 1.23.to_s
+  end
 end

data/spec/dataset_spec.rb

@@ -894,23 +894,23 @@ context "Dataset aggregate methods" do
   end
   
   specify "should include min" do
-    @d.min(:a).should == 'SELECT min(a) FROM test'
+    @d.min(:a).should == 'SELECT min(a) AS v FROM test'
   end
   
   specify "should include max" do
-    @d.max(:b).should == 'SELECT max(b) FROM test'
+    @d.max(:b).should == 'SELECT max(b) AS v FROM test'
   end
   
   specify "should include sum" do
-    @d.sum(:c).should == 'SELECT sum(c) FROM test'
+    @d.sum(:c).should == 'SELECT sum(c) AS v FROM test'
   end
   
   specify "should include avg" do
-    @d.avg(:d).should == 'SELECT avg(d) FROM test'
+    @d.avg(:d).should == 'SELECT avg(d) AS v FROM test'
   end
   
   specify "should accept qualified fields" do
-    @d.avg(:test__bc).should == 'SELECT avg(test.bc) FROM test'
+    @d.avg(:test__bc).should == 'SELECT avg(test.bc) AS v FROM test'
   end
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.1.9.8
-date: 2007-08-15 00:00:00 +03:00
+  version: 0.1.9.9
+date: 2007-08-18 00:00:00 +03:00
 summary: Lightweight ORM library for Ruby
 require_paths: 
 - lib
@@ -46,6 +46,7 @@ files:
 - spec/adapters/sqlite_spec.rb
 - lib/sequel
 - lib/sequel.rb
+- lib/sequel/ado.rb
 - lib/sequel/connection_pool.rb
 - lib/sequel/core_ext.rb
 - lib/sequel/database.rb