sequel 0.0.2 → 0.0.3

data/CHANGELOG

@@ -1,3 +1,13 @@
+*0.0.3*
+
+* Add Dataset#sum method.
+
+* Added support for exclusive ranges (thanks Christian Neukirchen.)
+
+* Added sequel console for quick'n'dirty access to databases.
+
+* Fixed small bug in Dataset#qualified_field_name for better join support.
+
 *0.0.2*
 
 * Added Sequel.open as alias to Sequel.connect.

data/README

@@ -24,6 +24,14 @@ Sequel currently supports:
 * Postgresql
 * SQLite 3
 
+== The Sequel Console
+
+Sequel now includes an IRB console for quick'n'dirty access to databases. You can use it like this:
+
+  sequel sqlite:///test.db
+
+You get an IRB session with the database object stored in DB.
+
 == A Short Tutorial
 
 === Connecting to a database
@@ -130,6 +138,9 @@ Counting records is easy:
 And you can also query maximum/minimum values:
   max_value = DB[:history].max(:value)
   
+Or calculate a sum:
+  total = DB[:items].sum(:price)
+  
 === Ordering Records
 
   posts.order(:stamp)
@@ -153,3 +164,22 @@ Or alternatively:
 === Updating Records
 
   posts.filter('stamp < ?', 3.days.ago).update(:state => 'archived')
+
+=== Joining Tables
+
+Joining is easy and very beneficial for many-to-many relationships:
+
+  order_items = DB[:items]join(:order_items, :item_id => :items__id).filter(:order_items__order_id => 1234)
+  
+This is equivalent to the SQL:
+
+  SELECT * FROM items LEFT OUTER JOIN order_items ON order_items.item_id = items.id WHERE order_items.order_id = 1234
+
+You can of course then do anything you like with the dataset:
+
+  order_total = order_items.sum(:price)
+  
+Which is equivalent to the SQL:
+
+  SELECT sum(price) FROM items LEFT OUTER JOIN order_items ON order_items.item_id = items.id WHERE order_items.order_id = 1234
+  

data/Rakefile

@@ -6,7 +6,7 @@ require 'fileutils'
 include FileUtils
 
 NAME = "sequel"
-VERS = "0.0.2"
+VERS = "0.0.3"
 CLEAN.include ['**/.*.sw?', 'pkg/*', '.config', 'doc/*', 'coverage/*']
 RDOC_OPTS = ['--quiet', '--title', "Sequel Documentation",
   "--opname", "index.html",
@@ -41,14 +41,16 @@ spec = Gem::Specification.new do |s|
   s.author = "Sharon Rosner"
   s.email = 'ciconia@gmail.com'
   s.homepage = 'http://sequel.rubyforge.org'
+  s.executables = ['sequel']
 
   s.add_dependency('metaid')
   s.required_ruby_version = '>= 1.8.2'
 
 #  s.files = %w(COPYING README Rakefile) + Dir.glob("{doc,spec,lib}/**/*")
-  s.files = %w(COPYING README Rakefile) + Dir.glob("{doc,lib}/**/*")
+  s.files = %w(COPYING README Rakefile) + Dir.glob("{bin,doc,lib}/**/*")
       
   s.require_path = "lib"
+  s.bindir = "bin"
 end
 
 Rake::GemPackageTask.new(spec) do |p|

data/bin/sequel

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'sequel'
+
+db = ARGV.shift
+
+if db.nil? || db.empty?
+  puts "Usage: sequel <connection string>"
+  puts "Sequel, an simple ORM framework for Ruby."
+  puts
+  puts "Examples:"
+  puts "  sequel sqlite:///blog.db"
+  puts "  sequel postgres://localhost/blog"
+  puts
+  puts "For more information see http://sequel.rubyforge.org"
+  exit
+end
+
+begin
+  scheme = URI.parse(db).scheme
+  require File.join('sequel', scheme)
+rescue LoadError
+  puts "Invalid or unknown scheme: #{scheme}"
+  exit
+rescue => e
+  puts e.message
+  exit
+end
+
+DB = Sequel.connect db
+begin
+  DB.test_connection
+rescue => e
+  puts e.message
+  puts e.backtrace.first
+  exit
+end
+
+require 'irb'
+puts "Your database is stored in DB..."
+IRB.start

data/lib/sequel/database.rb

@@ -37,6 +37,10 @@ module Sequel
       raise RuntimeError
     end
     
+    def test_connection
+      @pool.hold {} if @pool
+    end
+    
     # call-seq:
     #   db.execute(sql)
     #   db << sql

data/lib/sequel/dataset.rb

@@ -64,7 +64,7 @@ module Sequel
     # name isn't already qualified.
     def qualified_field_name(field, table)
       fn = field_name(field)
-      fn = QUALIFIED_FORMAT % [table, fn] unless fn =~ QUALIFIED_REGEXP
+      fn =~ QUALIFIED_REGEXP ? fn : QUALIFIED_FORMAT % [table, fn]
     end
     
     WILDCARD = '*'.freeze
@@ -109,17 +109,22 @@ module Sequel
     AND_SEPARATOR = " AND ".freeze
     EQUAL_COND = "(%s = %s)".freeze
     IN_EXPR = "(%s IN (%s))".freeze
-    BETWEEN_EXPR = "(%s BETWEEN %s AND %s)".freeze
+#    BETWEEN_EXPR = "(%s BETWEEN %s AND %s)".freeze
+    INCLUSIVE_RANGE_EXPR = "(%s >= %s AND %s <= %s)".freeze
+    EXCLUSIVE_RANGE_EXPR = "(%s >= %s AND %s < %s)".freeze
     
     # Formats an equality condition SQL expression.
     def where_condition(left, right)
+      left = field_name(left)
       case right
       when Range:
-        BETWEEN_EXPR % [field_name(left), literal(right.begin), literal(right.end)]
+        (right.exclude_end? ? EXCLUSIVE_RANGE_EXPR : INCLUSIVE_RANGE_EXPR) %
+          [left, literal(right.begin), left, literal(right.end)]
+#        BETWEEN_EXPR % [field_name(left), literal(right.begin), literal(right.end)]
       when Array:
-        IN_EXPR % [field_name(left), literal(right)]
+        IN_EXPR % [left, literal(right)]
       else
-        EQUAL_COND % [field_name(left), literal(right)]
+        EQUAL_COND % [left, literal(right)]
       end
     end
     
@@ -328,11 +333,15 @@ module Sequel
     
     # aggregates
     def min(field)
-      select(field.MIN).first[:min]
+      select(field.MIN).first.values.first
     end
     
     def max(field)
-      select(field.MAX).first[:max]
+      select(field.MAX).first.values.first
+    end
+
+    def sum(field)
+      select(field.SUM).first.values.first
     end
     
     LIMIT_1 = {:limit => 1}.freeze
@@ -382,8 +391,9 @@ class Symbol
     "#{field_name} AS #{target}"
   end
   
-  def MIN; "MIN(#{to_field_name})"; end
-  def MAX; "MAX(#{to_field_name})"; end
+  def MIN; "min(#{to_field_name})"; end
+  def MAX; "max(#{to_field_name})"; end
+  def SUM; "sum(#{to_field_name})"; end
 
   AS_REGEXP = /(.*)___(.*)/.freeze
   AS_FORMAT = "%s AS %s".freeze

data/lib/sequel/model.rb

@@ -54,9 +54,8 @@ module Sequel
     def self.set_primary_key(k); @primary_key = k; end
     
     def self.schema(name = nil, &block)
-      name ||= table_name
+      name ? set_table_name(name) : name = table_name
       @schema = Schema::Generator.new(name, &block)
-      set_table_name name
       if @schema.primary_key_name
         set_primary_key @schema.primary_key_name
       end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2007-03-18 00:00:00 +02:00
+  version: 0.0.3
+date: 2007-03-19 00:00:00 +02:00
 summary: ORM framework for Ruby.
 require_paths: 
 - lib
@@ -32,6 +32,7 @@ files:
 - COPYING
 - README
 - Rakefile
+- bin/sequel
 - doc/rdoc
 - lib/sequel
 - lib/sequel.rb
@@ -64,8 +65,8 @@ extra_rdoc_files:
 - README
 - CHANGELOG
 - COPYING
-executables: []
-
+executables: 
+- sequel
 extensions: []
 
 requirements: []