sequel 0.0.3 → 0.0.4

data/CHANGELOG

@@ -1,3 +1,9 @@
+*0.0.4*
+
+* Added preliminary MySQL support.
+
+* Code cleanup.
+
 *0.0.3*
 
 * Add Dataset#sum method.

data/README

@@ -12,6 +12,10 @@ Sequel is an ORM framework for Ruby. Sequel provides thread safety, connection p
 To check out the source code:
   
   svn co http://ruby-sequel.googlecode.com/svn/trunk
+  
+=== Contact
+
+If you have any comments or suggestions please send an email to ciconia at gmail.com and I'll get back to you.
 
 == Installation
 
@@ -23,6 +27,7 @@ Sequel currently supports:
 
 * Postgresql
 * SQLite 3
+* MySQL (preliminary support)
 
 == The Sequel Console
 
@@ -167,19 +172,24 @@ Or alternatively:
 
 === Joining Tables
 
-Joining is easy and very beneficial for many-to-many relationships:
+Joining is very useful in a variety of scenarios, for example many-to-many relationships. With Sequel it's really easy:
 
-  order_items = DB[:items]join(:order_items, :item_id => :items__id).filter(:order_items__order_id => 1234)
+  order_items = DB[:items].join(:order_items, :item_id => :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
+  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:
+You can 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
+  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.3"
+VERS = "0.0.4"
 CLEAN.include ['**/.*.sw?', 'pkg/*', '.config', 'doc/*', 'coverage/*']
 RDOC_OPTS = ['--quiet', '--title', "Sequel Documentation",
   "--opname", "index.html",

data/lib/sequel/connection_pool.rb

@@ -2,7 +2,8 @@ require 'thread'
 
 module Sequel
   class ConnectionPool
-    attr_reader :max_size, :mutex, :conn_maker
+    attr_reader :max_size, :mutex
+    attr_accessor :conn_maker
     attr_reader :available_connections, :allocated, :created_count
   
     def initialize(max_size = 4, &block)

data/lib/sequel/database.rb

@@ -8,12 +8,15 @@ module Sequel
   # The Database class is meant to be subclassed by database adapters in order
   # to provide the functionality needed for executing queries.
   class Database
+    attr_reader :opts, :pool
+    
     # Constructs a new instance of a database connection with the specified
     # options hash.
     #
     # Sequel::Database is an abstract class that is not useful by itself.
     def initialize(opts = {})
       @opts = opts
+      @pool = ConnectionPool.new(@opts[:max_connections] || 4)
     end
     
     # Returns a blank dataset
@@ -37,8 +40,13 @@ module Sequel
       raise RuntimeError
     end
     
+    def synchronize(&block)
+      @pool.hold(&block)
+    end
+      
     def test_connection
-      @pool.hold {} if @pool
+      @pool.hold {|conn|} if @pool
+      true
     end
     
     # call-seq:

data/lib/sequel/mysql.rb

@@ -0,0 +1,116 @@
+require 'mysql'
+
+module Sequel
+  module MySQL
+
+    class Database < Sequel::Database
+      set_adapter_scheme :mysql
+    
+      def initialize(opts = {})
+        super
+        @pool.conn_maker = proc do
+          Mysql.real_connect(@opts[:host], @opts[:user], @opts[:password], 
+            @opts[:database], @opts[:port])
+        end
+      end
+    
+      def dataset(opts = nil)
+        MySQL::Dataset.new(self, opts)
+      end
+    
+      def execute(sql)
+        @pool.hold do |conn|
+          conn.query(sql)
+        end
+      end
+      
+      def execute_insert(sql)
+        @pool.hold do |conn|
+          conn.query(sql)
+          conn.insert_id
+        end
+      end
+    
+      def execute_affected(sql)
+        @pool.hold do |conn|
+          conn.query(sql)
+          conn.affected_rows
+        end
+      end
+    
+      def transaction(&block)
+        @pool.hold {|conn| conn.transaction(&block)}
+      end
+    end
+    
+    class Dataset < Sequel::Dataset
+      def each(opts = nil, &block)
+        query_each(select_sql(opts), true, &block)
+        self
+      end
+      
+      def first_record(opts = nil)
+        query_first(select_sql(opts), true)
+      end
+    
+      def count(opts = nil)
+        query_single_value(count_sql(opts)).to_i
+      end
+    
+      def insert(values = nil, opts = nil)
+        @db.execute_insert(insert_sql(values, opts))
+      end
+    
+      def update(values, opts = nil)
+        @db.execute_affected(update_sql(values, opts))
+      end
+    
+      def delete(opts = nil)
+        @db.execute_affected(delete_sql(opts))
+      end
+      
+      def query_each(sql, use_record_class = false)
+        @db.synchronize do
+          result = @db.execute(sql)
+          begin
+            if use_record_class && @record_class
+              result.each_hash {|r| yield @record_class.new(r)}
+            else
+              result.each_hash {|r| yield r}
+            end
+          ensure
+            result.free
+          end
+        end
+        self
+      end
+      
+      def query_first(sql, use_record_class = false)
+        @db.synchronize do
+          result = @db.execute(sql)
+          begin
+            if use_record_class && @record_class
+              @record_class.new(result.fetch_hash)
+            else
+              result.fetch_hash
+            end
+          ensure
+            result.free
+          end
+          row
+        end
+      end
+      
+      def query_single_value(sql)
+        @db.synchronize do
+          result = @db.execute(sql)
+          begin
+            return result.fetch_hash.values[0]
+          ensure
+            result.free
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sequel/postgres.rb

@@ -18,10 +18,6 @@ class PGconn
     status == PGconn::CONNECTION_OK
   end
   
-  SQL_BEGIN = 'BEGIN'.freeze
-  SQL_COMMIT = 'COMMIT'.freeze
-  SQL_ROLLBACK = 'ROLLBACK'.freeze
-  
   def execute(sql)
     begin
       # ServerSide.info(sql)
@@ -41,6 +37,10 @@ class PGconn
   
   attr_reader :transaction_in_progress
   
+  SQL_BEGIN = 'BEGIN'.freeze
+  SQL_COMMIT = 'COMMIT'.freeze
+  SQL_ROLLBACK = 'ROLLBACK'.freeze
+  
   def transaction
     if @transaction_in_progress
       return yield
@@ -101,18 +101,17 @@ module Sequel
     class Database < Sequel::Database
       set_adapter_scheme :postgres
     
-      attr_reader :pool
-    
       def initialize(opts = {})
         super
-        @pool = ConnectionPool.new(@opts[:max_connections] || 4) do
+        @pool.conn_maker = proc do
           PGconn.connect(
             @opts[:host] || 'localhost',
             @opts[:port] || 5432,
             '', '',
             @opts[:database] || 'reality_development',
             @opts[:user] || 'postgres',
-            @opts[:password])
+            @opts[:password]
+          )
         end
       end
     
@@ -158,8 +157,6 @@ module Sequel
     end
   
     class Dataset < Sequel::Dataset
-      attr_reader :result, :fields
-  
       def literal(v)
         case v
         when Array: super

data/lib/sequel/sqlite.rb

@@ -5,11 +5,10 @@ module Sequel
   module SQLite
     class Database < Sequel::Database
       set_adapter_scheme :sqlite
-      attr_reader :pool
     
       def initialize(opts = {})
         super
-        @pool = ConnectionPool.new(@opts[:max_connections] || 4) do
+        @pool.conn_maker = proc do
           db = SQLite3::Database.new(@opts[:database])
           db.type_translation = true
           db
@@ -49,17 +48,6 @@ module Sequel
           end
         end
       end
-      
-      def synchronize(&block)
-        @pool.hold(&block)
-      end
-    
-      def transaction(&block)
-        @pool.hold {|conn| conn.transaction(&block)}
-      end
-
-      def table_exists?(name)
-      end
     end
     
     class Dataset < Sequel::Dataset

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2007-03-19 00:00:00 +02:00
+  version: 0.0.4
+date: 2007-03-20 00:00:00 +02:00
 summary: ORM framework for Ruby.
 require_paths: 
 - lib
@@ -36,14 +36,15 @@ files:
 - doc/rdoc
 - lib/sequel
 - lib/sequel.rb
-- lib/sequel/connection_pool.rb
-- lib/sequel/core_ext.rb
-- lib/sequel/database.rb
 - lib/sequel/dataset.rb
 - lib/sequel/model.rb
 - lib/sequel/postgres.rb
 - lib/sequel/schema.rb
 - lib/sequel/sqlite.rb
+- lib/sequel/connection_pool.rb
+- lib/sequel/database.rb
+- lib/sequel/core_ext.rb
+- lib/sequel/mysql.rb
 - CHANGELOG
 test_files: []