sequel 0.0.5 → 0.0.6

data/CHANGELOG

@@ -1,3 +1,17 @@
+*0.0.6*
+
+* Added Dataset#sql as alias to Dataset#select_sql.
+
+* Dataset#where and Dataset#exclude can now be used for refining dataset conditions, enabling stuff like posts.where(:title => 'abcdef').exclude(:user_id => 3).
+
+* Implemented Dataset#exclude method.
+
+* Added Sequel::Schema#auto_primary_key method for setting an automatic primary key to be added to every table definition. Changed the schema generator to not define a primary key by default.
+
+* Changed Sequel::Database#table_exists? to rely on the tables method if it is available.
+
+* Implemented SQLite::Database#tables.
+
 *0.0.5*
 
 * Added Dataset#[] method. Refactored Model#find and Model#[].

data/README

@@ -1,4 +1,4 @@
-== Serquel: Concise ORM for Ruby
+== Sequel: Concise ORM for Ruby
 
 Sequel is an ORM framework for Ruby. Sequel provides thread safety, connection pooling, and a concise DSL for constructing queries and table schemas.
 
@@ -51,11 +51,11 @@ Note: you don't need to require 'sequel' separately before that, as each adapter
 
 There are two ways to create a connection to a database. The easier way is to provide a connection URL:
 
-  DB = Sequel.connect("sqlite:///blog.db")
+  DB = Sequel.open("sqlite:///blog.db")
 
 You can also specify optional parameters, such as the connection pool size:
 
-  DB = Sequel.connect("postgres://postgres:postgres@localhost/my_db",
+  DB = Sequel.open("postgres://postgres:postgres@localhost/my_db",
     :max_connections => 10)
 
 The second, more verbose, way is to create an instance of a database class:

data/Rakefile

@@ -6,7 +6,7 @@ require 'fileutils'
 include FileUtils
 
 NAME = "sequel"
-VERS = "0.0.5"
+VERS = "0.0.6"
 CLEAN.include ['**/.*.sw?', 'pkg/*', '.config', 'doc/*', 'coverage/*']
 RDOC_OPTS = ['--quiet', '--title', "Sequel: Concise ORM for Ruby",
   "--opname", "index.html",
@@ -24,7 +24,7 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'doc/rdoc'
   rdoc.options += RDOC_OPTS
   rdoc.main = "README"
-  rdoc.title = "Sequel Documentation"
+  rdoc.title = "Sequel: Concise ORM for Ruby"
   rdoc.rdoc_files.add ['README', 'COPYING', 'lib/sequel.rb', 'lib/sequel/**/*.rb']
 end
 
@@ -36,7 +36,7 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files = ["README", "CHANGELOG", "COPYING"]
   s.rdoc_options += RDOC_OPTS + 
     ['--exclude', '^(examples|extras)\/', '--exclude', 'lib/sequel.rb']
-  s.summary = "ORM framework for Ruby."
+  s.summary = "Concise ORM for Ruby."
   s.description = s.summary
   s.author = "Sharon Rosner"
   s.email = 'ciconia@gmail.com'

data/lib/sequel/database.rb

@@ -93,11 +93,43 @@ module Sequel
     # Performs a brute-force check for the existance of a table. This method is
     # usually overriden in descendants.
     def table_exists?(name)
-      from(name).first && true
+      if respond_to?(:tables)
+        tables.include?(name.to_sym)
+      else
+        from(name).first && true
+      end
     rescue
       false
     end
     
+    SQL_BEGIN = 'BEGIN'.freeze
+    SQL_COMMIT = 'COMMIT'.freeze
+    SQL_ROLLBACK = 'ROLLBACK'.freeze
+    
+    def transaction
+      @pool.hold do |conn|
+        @transactions ||= []
+        if @transactions.include? Thread.current
+          return yield(conn)
+        end
+        # ServerSide.info('BEGIN')
+        conn.execute(SQL_BEGIN)
+        begin
+          @transactions << Thread.current
+          result = yield(conn)
+          # ServerSide.info('COMMIT')
+          conn.execute(SQL_COMMIT)
+          result
+        rescue => e
+          # ServerSide.info('ROLLBACK')
+          conn.execute(SQL_ROLLBACK)
+          raise e
+        ensure
+          @transactions.delete(Thread.current)
+        end
+      end
+    end
+    
     @@adapters = Hash.new
     
     # Sets the adapter scheme for the database class. Call this method in

data/lib/sequel/dataset.rb

@@ -178,15 +178,26 @@ module Sequel
       end
     end
     
+    AND_WHERE = "%s AND %s".freeze
+    
     # Returns a copy of the dataset with the where conditions changed.
-    def where(*where)
-      if where.size == 1
-        where = where.first
-        if @opts[:where] && @opts[:where].is_a?(Hash) && where.is_a?(Hash)
-          where = @opts[:where].merge(where)
+    def where(*cond)
+      cond = cond.first if cond.size == 1
+      if @opts[:where]
+        if @opts[:where].is_a?(Hash) && cond.is_a?(Hash)
+          cond = @opts[:where].merge(cond)
+        else
+          cond = AND_WHERE % [where_list(@opts[:where]), where_list(cond)]
         end
       end
-      dup_merge(:where => where)
+      dup_merge(:where => cond)
+    end
+    
+    NOT_WHERE = "NOT %s".freeze
+    
+    def exclude(*cond)
+      cond = cond.first if cond.size == 1
+      where(NOT_WHERE % where_list(cond))
     end
     
     LEFT_OUTER_JOIN = 'LEFT OUTER JOIN'.freeze
@@ -201,9 +212,8 @@ module Sequel
 
     alias_method :filter, :where
     alias_method :all, :to_a
-    alias_method :enum_map, :map
     
-    # 
+    alias_method :enum_map, :map
     def map(field_name = nil, &block)
       if block
         enum_map(&block)
@@ -272,6 +282,8 @@ module Sequel
       sql
     end
     
+    alias_method :sql, :select_sql
+    
     INSERT = "INSERT INTO %s (%s) VALUES (%s)".freeze
     INSERT_EMPTY = "INSERT INTO %s DEFAULT VALUES".freeze
     

data/lib/sequel/postgres.rb

@@ -154,10 +154,6 @@ module Sequel
       def transaction(&block)
         @pool.hold {|conn| conn.transaction(&block)}
       end
-
-      def table_exists?(name)
-        from(:pg_class).filter(:relname => name, :relkind => 'r').count > 0
-      end
     end
   
     class Dataset < Sequel::Dataset

data/lib/sequel/schema.rb

@@ -83,9 +83,9 @@ module Sequel
     class Generator
       attr_reader :table_name
     
-      def initialize(table_name, &block)
+      def initialize(table_name, auto_primary_key, &block)
         @table_name = table_name
-        @primary_key = {:name => :id, :type => :serial, :primary_key => true}
+        @primary_key = auto_primary_key
         @columns = []
         @indexes = []
         instance_eval(&block)
@@ -140,8 +140,16 @@ module Sequel
       instance_eval(&block) if block
     end
     
+    def auto_primary_key(name, type = nil, opts = nil)
+      @auto_primary_key = {
+        :name => name,
+        :type => type || :serial,
+        :primary_key => true
+      }.merge(opts || {})
+    end
+    
     def create_table(table_name, &block)
-      @instructions << Generator.new(table_name, &block)
+      @instructions << Generator.new(table_name, @auto_primary_key, &block)
     end
     
     def create(db)

data/lib/sequel/sqlite.rb

@@ -22,9 +22,11 @@ module Sequel
       def dataset(opts = nil)
         SQLite::Dataset.new(self, opts)
       end
+      
+      TABLES_FILTER = "type = 'table' AND NOT name = 'sqlite_sequence'"
     
       def tables
-        # return a list of tables
+        self[:sqlite_master].filter(TABLES_FILTER).map {|r| r[:name].to_sym}
       end
     
       def execute(sql)

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
-date: 2007-03-21 00:00:00 +02:00
-summary: ORM framework for Ruby.
+  version: 0.0.6
+date: 2007-03-22 00:00:00 +02:00
+summary: Concise ORM for Ruby.
 require_paths: 
 - lib
 email: ciconia@gmail.com
 homepage: http://sequel.rubyforge.org
 rubyforge_project: 
-description: ORM framework for Ruby.
+description: Concise ORM for Ruby.
 autorequire: 
 default_executable: 
 bindir: bin
@@ -33,7 +33,6 @@ files:
 - README
 - Rakefile
 - bin/sequel
-- doc/rdoc
 - lib/sequel
 - lib/sequel.rb
 - lib/sequel/dataset.rb