sequel 0.1.2 → 0.1.3

data/CHANGELOG

@@ -1,3 +1,9 @@
+*0.1.3*
+
+* Implemented DBI adapter.
+
+* Refactored database connection code. Now handled through Database#connect.
+
 *0.1.2*
 
 * The first opened database is automatically assigned to to Model.db.

data/README

@@ -30,7 +30,8 @@ Sequel currently supports:
 
 * Postgresql
 * SQLite 3
-* MySQL (preliminary support)
+* DBI
+* MySQL (basic support)
 
 == The Sequel Console
 

data/Rakefile

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

data/lib/sequel/database.rb

@@ -20,6 +20,11 @@ module Sequel
       @opts = opts
       @pool = ConnectionPool.new(@opts[:max_connections] || 4, &block)
       @logger = opts[:logger]
+      @pool.connection_proc = block || proc {connect}
+    end
+    
+    def connect
+      true # we can't return nil or false, because then pool will block forever
     end
     
     def uri

data/lib/sequel/dbi.rb

@@ -0,0 +1,80 @@
+if !Object.const_defined?('Sequel')
+  require File.join(File.dirname(__FILE__), '../sequel')
+end
+
+require 'dbi'
+
+module Sequel
+  module DBI
+
+    class Database < Sequel::Database
+      set_adapter_scheme :dbi
+    
+      def connect
+        dbname = @opts[:database] =~ /^DBI:/ ? \
+          @opts[:database] : @opts[:database] = 'DBI:' + @opts[:database]
+        ::DBI.connect(dbname, @opts[:user], @opts[:password])
+      end
+    
+      def dataset(opts = nil)
+        DBI::Dataset.new(self, opts)
+      end
+    
+      def execute(sql)
+        @logger.info(sql) if @logger
+        @pool.hold do |conn|
+          conn.execute(sql)
+        end
+      end
+      
+      def do(sql)
+        @logger.info(sql) if @logger
+        @pool.hold do |conn|
+          conn.do(sql)
+        end
+      end
+    end
+    
+    class Dataset < Sequel::Dataset
+      def literal(v)
+        case v
+        when Time: literal(v.iso8601)
+        else
+          super
+        end
+      end
+
+      def each(opts = nil, &block)
+        @db.synchronize do
+          s = @db.execute select_sql(opts)
+          begin
+            s.fetch {|r| yield hash_row(s, r)}
+          ensure
+            s.finish rescue nil
+          end
+        end
+        self
+      end
+      
+      def hash_row(stmt, row)
+        stmt.column_names.inject({}) do |m, n|
+          m[n.to_sym] = 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/mysql.rb

@@ -2,7 +2,7 @@ if !Object.const_defined?('Sequel')
   require File.join(File.dirname(__FILE__), '../sequel')
 end
 
-#require 'mysql'
+require 'mysql'
 
 module Sequel
   module MySQL
@@ -10,12 +10,9 @@ module Sequel
     class Database < Sequel::Database
       set_adapter_scheme :mysql
     
-      def initialize(opts = {})
-        super
-        @pool.connection_proc = proc do
-          Mysql.real_connect(@opts[:host], @opts[:user], @opts[:password], 
-            @opts[:database], @opts[:port])
-        end
+      def connect
+        Mysql.real_connect(@opts[:host], @opts[:user], @opts[:password], 
+          @opts[:database], @opts[:port])
       end
     
       def dataset(opts = nil)

data/lib/sequel/postgres.rb

@@ -35,30 +35,8 @@ class PGconn
     end
   end
   
-  attr_reader :transaction_in_progress
+  attr_accessor :transaction_in_progress
   
-  SQL_BEGIN = 'BEGIN'.freeze
-  SQL_COMMIT = 'COMMIT'.freeze
-  SQL_ROLLBACK = 'ROLLBACK'.freeze
-  
-  def transaction
-    if @transaction_in_progress
-      return yield
-    end
-    async_exec(SQL_BEGIN)
-    begin
-      @transaction_in_progress = true
-      result = yield
-      async_exec(SQL_COMMIT)
-      result
-    rescue => e
-      async_exec(SQL_ROLLBACK)
-      raise e
-    ensure
-      @transaction_in_progress = nil
-    end
-  end
-
   SELECT_CURRVAL = "SELECT currval('%s')".freeze
       
   def last_insert_id(table)
@@ -140,21 +118,17 @@ module Sequel
     class Database < Sequel::Database
       set_adapter_scheme :postgres
     
-      def initialize(opts = {})
-        super
-        @pool.connection_proc = proc do
-          PGconn.connect(
-            @opts[:host] || 'localhost',
-            @opts[:port] || 5432,
-            '', '',
-            @opts[:database],
-            @opts[:user],
-            @opts[:password]
-          )
-        end
+      def connect
+        PGconn.connect(
+          @opts[:host] || 'localhost',
+          @opts[:port] || 5432,
+          '', '',
+          @opts[:database],
+          @opts[:user],
+          @opts[:password]
+        )
       end
     
-    
       def dataset(opts = nil)
         Postgres::Dataset.new(self, opts)
       end
@@ -177,11 +151,17 @@ module Sequel
       def execute(sql)
         @logger.info(sql) if @logger
         @pool.hold {|conn| conn.execute(sql)}
+      rescue => e
+        @logger.error(e.message) if @logger
+        raise e
       end
     
       def execute_and_forget(sql)
         @logger.info(sql) if @logger
         @pool.hold {|conn| conn.execute(sql).clear}
+      rescue => e
+        @logger.error(e.message) if @logger
+        raise e
       end
       
       def execute_insert(sql, table)
@@ -190,15 +170,48 @@ module Sequel
           conn.execute(sql).clear
           conn.last_insert_id(table)
         end
+      rescue => e
+        @logger.error(e.message) if @logger
+        raise e
       end
     
       def synchronize(&block)
         @pool.hold(&block)
       end
       
-      def transaction(&block)
-        @pool.hold {|conn| conn.transaction(&block)}
+      SQL_BEGIN = 'BEGIN'.freeze
+      SQL_COMMIT = 'COMMIT'.freeze
+      SQL_ROLLBACK = 'ROLLBACK'.freeze
+  
+      def transaction
+        @pool.hold do |conn|
+          if conn.transaction_in_progress
+            yield conn
+          else
+            @logger.info(SQL_BEGIN) if @logger
+            conn.async_exec(SQL_BEGIN)
+            begin
+              conn.transaction_in_progress = true
+              result = yield
+              begin
+                @logger.info(SQL_COMMIT) if @logger
+                conn.async_exec(SQL_COMMIT)
+              rescue => e
+                @logger.error(e.message) if @logger
+                raise e
+              end
+              result
+            rescue => e
+              @logger.info(SQL_ROLLBACK) if @logger
+              conn.async_exec(SQL_ROLLBACK) rescue nil
+              raise e
+            ensure
+              conn.transaction_in_progress = nil
+            end
+          end
+        end
       end
+
     end
   
     class Dataset < Sequel::Dataset

data/lib/sequel/sqlite.rb

@@ -10,13 +10,10 @@ module Sequel
     class Database < Sequel::Database
       set_adapter_scheme :sqlite
     
-      def initialize(opts = {})
-        super
-        @pool.connection_proc = proc do
-          db = SQLite3::Database.new(@opts[:database])
-          db.type_translation = true
-          db
-        end
+      def connect
+        db = SQLite3::Database.new(@opts[:database])
+        db.type_translation = true
+        db
       end
     
       def dataset(opts = nil)

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.1.2
-date: 2007-05-19 00:00:00 +03:00
+  version: 0.1.3
+date: 2007-05-20 00:00:00 +03:00
 summary: Concise ORM for Ruby.
 require_paths: 
 - lib
@@ -34,19 +34,20 @@ files:
 - Rakefile
 - bin/sequel
 - lib/sequel
-- lib/sequel.rb
-- lib/sequel/connection_pool.rb
-- lib/sequel/core_ext.rb
+- lib/sequel/pretty_table.rb
+- lib/sequel/model.rb
+- lib/sequel/schema.rb
+- lib/sequel/sqlite.rb
 - lib/sequel/database.rb
 - lib/sequel/dataset.rb
-- lib/sequel/error.rb
-- lib/sequel/expressions.rb
-- lib/sequel/model.rb
 - lib/sequel/mysql.rb
 - lib/sequel/postgres.rb
-- lib/sequel/pretty_table.rb
-- lib/sequel/schema.rb
-- lib/sequel/sqlite.rb
+- lib/sequel/connection_pool.rb
+- lib/sequel/core_ext.rb
+- lib/sequel/error.rb
+- lib/sequel/expressions.rb
+- lib/sequel/dbi.rb
+- lib/sequel.rb
 - CHANGELOG
 test_files: []