sequel 0.4.1.3 → 0.4.2

data/CHANGELOG

@@ -1,4 +1,16 @@
-=== SVN
+=== 0.4.2 (2007-12-07)
+
+* Implemented Model#save_changes.
+
+* Extended Model#save to accept specific columns to update.
+
+* Implemented experimental JDBC adapter.
+
+* Added adapter skeleton as starting point for new adapters.
+
+* Cleaned-up adapters and moved automatic requiring of 'sequel' to adapter stubs.
+
+=== 0.4.1.3 (2007-12-05)
 
 * Better plugin conventions.
 

data/README

@@ -37,7 +37,7 @@ Sequel currently supports:
 * PostgreSQL
 * SQLite 3
 
-There are also experimental adapters for DB2 and OpenBase.
+There are also experimental adapters for DB2, OpenBase and JDBC (on JRuby).
 
 == The Sequel Console
 

data/Rakefile

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

data/lib/sequel/adapters/adapter_skeleton.rb

@@ -0,0 +1,67 @@
+# require 'adapter_lib'
+
+module Sequel
+  module Adapter
+    class Database < Sequel::Database
+      set_adapter_scheme :adapter
+      
+      def connect
+        AdapterDB.new(@opts[:database], @opts[:user], @opts[:password])
+      end
+      
+      def disconnect
+        @pool.disconnect {|c| c.disconnect}
+      end
+    
+      def dataset(opts = nil)
+        Adapter::Dataset.new(self, opts)
+      end
+    
+      def execute(sql)
+        @logger.info(sql) if @logger
+        @pool.hold {|conn| conn.exec(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
+          cursor = @db.execute sql
+          begin
+            @columns = cursor.get_col_names.map {|c| c.to_sym}
+            while r = cursor.fetch
+              row = {}
+              r.each_with_index {|v, i| row[@columns[i]] = v}
+              yield row
+            end
+          ensure
+            cursor.close
+          end
+        end
+        self
+      end
+      
+      def insert(*values)
+        @db.do insert_sql(*values)
+      end
+    
+      def update(values, opts = nil)
+        @db.do update_sql(values, opts)
+      end
+    
+      def delete(opts = nil)
+        @db.do delete_sql(opts)
+      end
+    end
+  end
+end

data/lib/sequel/adapters/ado.rb

@@ -1,7 +1,3 @@
-if !Object.const_defined?('Sequel')
-  require File.join(File.dirname(__FILE__), '../../sequel')
-end
-
 require 'win32ole'
 
 module Sequel

data/lib/sequel/adapters/db2.rb

@@ -1,7 +1,3 @@
-if !Object.const_defined?('Sequel')
-  require File.join(File.dirname(__FILE__), '../../sequel')
-end
-
 require 'db2/db2cli'
 
 module Sequel

data/lib/sequel/adapters/dbi.rb

@@ -1,7 +1,3 @@
-if !Object.const_defined?('Sequel')
-  require File.join(File.dirname(__FILE__), '../../sequel')
-end
-
 require 'dbi'
 
 module Sequel

data/lib/sequel/adapters/informix.rb

@@ -1,7 +1,3 @@
-if !Object.const_defined?('Sequel')
-  require File.join(File.dirname(__FILE__), '../../sequel')
-end
-
 require 'informix'
 
 module Sequel

data/lib/sequel/adapters/jdbc.rb

@@ -0,0 +1,107 @@
+require 'java'
+
+module Sequel
+  module JDBC
+    module JavaLang; include_package 'java.lang'; end
+    module JavaSQL; include_package 'java.sql'; end
+    
+    def self.load_driver(driver)
+      JavaLang::Class.forName(driver)
+      # "com.mysql.jdbc.Driver"
+    end
+    
+    class Database < Sequel::Database
+      set_adapter_scheme :jdbc
+      
+      def connect
+        unless conn_string = @opts[:uri] || @opts[:url] || @opts[:database]
+          raise SequelError, "No connection string specified"
+        end
+        unless conn_string =~ /^jdbc:/
+          conn_string = "jdbc:#{conn_string}"
+        end
+        JavaSQL::DriverManager.getConnection(
+          conn_string, 
+          @opts[:user], 
+          @opts[:password]
+        )
+        # "jdbc:mysql://127.0.0.1:3306/ruby?user=root"
+        # "mysql://127.0.0.1:3306/ruby?user=root"
+      end
+      
+      def disconnect
+        @pool.disconnect {|c| c.close}
+      end
+    
+      def dataset(opts = nil)
+        JDBC::Dataset.new(self, opts)
+      end
+      
+      def execute_and_forget(sql)
+        @logger.info(sql) if @logger
+        @pool.hold do |conn|
+          stmt = conn.createStatement
+          begin
+            stmt.executeQuery(sql)
+          ensure
+            stmt.close
+          end
+        end
+      end
+      
+      def execute(sql)
+        @logger.info(sql) if @logger
+        @pool.hold do |conn|
+          stmt = conn.createStatement
+          begin
+            yield stmt.executeQuery(sql)
+          ensure
+            stmt.close
+          end
+        end
+      end
+    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
+          @db.execute(sql) do |result|
+            # get column names
+            meta = result.getMetaData
+            column_count = meta.getColumnCount
+            @columns = []
+            column_count.times {|i| @columns << meta.getColumnName(i).to_sym}
+
+            # get rows
+            while result.next
+              row = {}
+              @columns.each_with_index {|v, i| row[v] = result.getObject(i)}
+              yield row
+            end
+          end
+        end
+        self
+      end
+      
+      def insert(*values)
+        @db.execute_and_forget insert_sql(*values)
+      end
+    
+      def update(values, opts = nil)
+        @db.execute_and_forget update_sql(values, opts)
+      end
+    
+      def delete(opts = nil)
+        @db.execute_and_forget delete_sql(opts)
+      end
+    end
+  end
+end

data/lib/sequel/adapters/mysql.rb

@@ -1,7 +1,3 @@
-if !Object.const_defined?('Sequel')
-  require File.join(File.dirname(__FILE__), '../../sequel')
-end
-
 require 'mysql'
 
 # Monkey patch Mysql::Result to yield hashes with symbol keys

data/lib/sequel/adapters/odbc.rb

@@ -1,7 +1,3 @@
-if !Object.const_defined?('Sequel')
-  require File.join(File.dirname(__FILE__), '../../sequel')
-end
-
 require 'odbc'
 
 module Sequel

data/lib/sequel/adapters/odbc_mssql.rb

@@ -1,7 +1,3 @@
-if !Object.const_defined?('Sequel')
-  require File.join(File.dirname(__FILE__), '../../sequel')
-end
-
 if !Sequel.const_defined?('ODBC')
   require File.join(File.dirname(__FILE__), 'odbc')
 end

data/lib/sequel/adapters/openbase.rb

@@ -1,7 +1,3 @@
-if !Object.const_defined?('Sequel')
-  require File.join(File.dirname(__FILE__), '../../sequel')
-end
-
 require 'openbase'
 
 module Sequel

data/lib/sequel/adapters/oracle.rb

@@ -1,7 +1,3 @@
-if !Object.const_defined?('Sequel')
-  require File.join(File.dirname(__FILE__), '../../sequel')
-end
-
 require 'oci8'
 
 module Sequel

data/lib/sequel/adapters/postgres.rb

@@ -1,7 +1,3 @@
-if !Object.const_defined?('Sequel')
-  require File.join(File.dirname(__FILE__), '../../sequel')
-end
-
 require 'postgres'
 
 class PGconn

data/lib/sequel/adapters/sqlite.rb

@@ -1,7 +1,3 @@
-if !Object.const_defined?('Sequel')
-  require File.join(File.dirname(__FILE__), '../../sequel')
-end
-
 require 'sqlite3'
 
 module Sequel

data/lib/sequel/ado.rb

@@ -1,2 +1,6 @@
 warn "Requiring 'sequel/ado' is deprecated. Please modify your code to only require 'sequel' instead."
+
+if !Object.const_defined?('Sequel')
+  require File.join(File.dirname(__FILE__), '../sequel')
+end
 require File.join(File.dirname(__FILE__), 'adapters/ado')

data/lib/sequel/db2.rb

@@ -1,2 +1,6 @@
 warn "Requiring 'sequel/db2' is deprecated. Please modify your code to require 'sequel' instead."
+
+if !Object.const_defined?('Sequel')
+  require File.join(File.dirname(__FILE__), '../sequel')
+end
 require File.join(File.dirname(__FILE__), 'adapters/db2')

data/lib/sequel/dbi.rb

@@ -1,2 +1,6 @@
 warn "Requiring 'sequel/dbi' is deprecated. Please modify your code to require 'sequel' instead."
+
+if !Object.const_defined?('Sequel')
+  require File.join(File.dirname(__FILE__), '../sequel')
+end
 require File.join(File.dirname(__FILE__), 'adapters/dbi')

data/lib/sequel/informix.rb

@@ -1,2 +1,6 @@
 warn "Requiring 'sequel/informix' is deprecated. Please modify your code to require 'sequel' instead."
+
+if !Object.const_defined?('Sequel')
+  require File.join(File.dirname(__FILE__), '../sequel')
+end
 require File.join(File.dirname(__FILE__), 'adapters/informix')

data/lib/sequel/model/record.rb

@@ -1,14 +1,16 @@
 module Sequel
   class Model
     attr_reader :values
+    attr_reader :changed_columns
 
     # Returns value of attribute.
     def [](column)
       @values[column]
     end
-    # Sets value of attribute.
+    # Sets value of attribute and marks the column as changed.
     def []=(column, value)
       @values[column] = value
+      @changed_columns << column unless @changed_columns.include?(column)
     end
 
     # Enumerates through all attributes.
@@ -171,6 +173,7 @@ module Sequel
     # <tt>new_record</tt> is set to false.
     def initialize(values = {}, new_record = false, &block)
       @values = values
+      @changed_columns = []
 
       @new = new_record
       unless @new # determine if it's a new record
@@ -194,8 +197,9 @@ module Sequel
       this.count > 0
     end
     
-    # Creates or updates dataset for Model and runs hooks.
-    def save
+    # Creates or updates the associated record. This method can also
+    # accept a list of specific columns to update.
+    def save(*columns)
       run_hooks(:before_save)
       if @new
         run_hooks(:before_create)
@@ -213,12 +217,24 @@ module Sequel
         run_hooks(:after_create)
       else
         run_hooks(:before_update)
-        this.update(@values)
+        if columns.empty?
+          this.update(@values)
+          @changed_columns = []
+        else # update only the specified columns
+          this.update(@values.reject {|k, v| !columns.include?(k)})
+          @changed_columns.reject! {|c| columns.include?(c)}
+        end
         run_hooks(:after_update)
       end
       run_hooks(:after_save)
       self
     end
+    
+    # Saves only changed columns or does nothing if no columns are marked as 
+    # chanaged.
+    def save_changes
+      save(*@changed_columns) unless @changed_columns.empty?
+    end
 
     # Updates and saves values to database from the passed-in Hash.
     def set(values)
@@ -268,7 +284,10 @@ module Sequel
         # define the column accessor
         Thread.exclusive do
           if write
-            model.class_def(m) {|v| @values[att] = v}
+            model.class_def(m) do |v|
+              @values[att] = v
+              @changed_columns << att unless @changed_columns.include?(att)
+            end
           else
             model.class_def(m) {@values[att]}
           end

data/lib/sequel/mysql.rb

@@ -1,2 +1,6 @@
 warn "Requiring 'sequel/mysql' is deprecated. Please modify your code to require 'sequel' instead."
+
+if !Object.const_defined?('Sequel')
+  require File.join(File.dirname(__FILE__), '../sequel')
+end
 require File.join(File.dirname(__FILE__), 'adapters/mysql')

data/lib/sequel/odbc.rb

@@ -1,2 +1,6 @@
 warn "Requiring 'sequel/odbc' is deprecated. Please modify your code to require 'sequel' instead."
+
+if !Object.const_defined?('Sequel')
+  require File.join(File.dirname(__FILE__), '../sequel')
+end
 require File.join(File.dirname(__FILE__), 'adapters/odbc')

data/lib/sequel/oracle.rb

@@ -1,2 +1,6 @@
 warn "Requiring 'sequel/oracle' is deprecated. Please modify your code to require 'sequel' instead."
+
+if !Object.const_defined?('Sequel')
+  require File.join(File.dirname(__FILE__), '../sequel')
+end
 require File.join(File.dirname(__FILE__), 'adapters/oracle')

data/lib/sequel/postgres.rb

@@ -1,2 +1,6 @@
 warn "Requiring 'sequel/postgres' is deprecated. Please modify your code to require 'sequel' instead."
+
+if !Object.const_defined?('Sequel')
+  require File.join(File.dirname(__FILE__), '../sequel')
+end
 require File.join(File.dirname(__FILE__), 'adapters/postgres')

data/lib/sequel/sqlite.rb

@@ -1,2 +1,6 @@
 warn "Requiring 'sequel/sqlite' is deprecated. Please modify your code to require 'sequel' instead."
+
+if !Object.const_defined?('Sequel')
+  require File.join(File.dirname(__FILE__), '../sequel')
+end
 require File.join(File.dirname(__FILE__), 'adapters/sqlite')

data/spec/model_spec.rb

@@ -445,6 +445,118 @@ context "Model attribute accessors" do
   end
 end
 
+context "Model attribute setters" do
+  setup do
+    MODEL_DB.reset
+
+    @c = Class.new(Sequel::Model(:items)) do
+      def columns
+        [:id, :x, :y]
+      end
+    end
+  end
+  
+  specify "should mark the column value as changed" do
+    o = @c.new
+    o.changed_columns.should == []
+
+    o.x = 2
+    o.changed_columns.should == [:x]
+    
+    o.y = 3
+    o.changed_columns.should == [:x, :y]
+    
+    o.changed_columns.clear
+    
+    o[:x] = 2
+    o.changed_columns.should == [:x]
+    
+    o[:y] = 3
+    o.changed_columns.should == [:x, :y]
+  end
+end
+
+context "Model#save" do
+  setup do
+    MODEL_DB.reset
+
+    @c = Class.new(Sequel::Model(:items)) do
+      def columns
+        [:id, :x, :y]
+      end
+    end
+  end
+  
+  specify "should insert a record for a new model instance" do
+    o = @c.new(:x => 1)
+    o.save
+    
+    MODEL_DB.sqls.first.should == "INSERT INTO items (x) VALUES (1)"
+  end
+
+  specify "should update a record for an existing model instance" do
+    o = @c.new(:id => 3, :x => 1)
+    o.save
+    
+    MODEL_DB.sqls.first.should == "UPDATE items SET x = 1, id = 3 WHERE (id = 3)"
+  end
+  
+  specify "should update only the given columns if given" do
+    o = @c.new(:id => 3, :x => 1, :y => nil)
+    o.save(:y)
+    
+    MODEL_DB.sqls.first.should == "UPDATE items SET y = NULL WHERE (id = 3)"
+  end
+  
+  specify "should mark saved columns as not changed" do
+    o = @c.new(:id => 3, :x => 1, :y => nil)
+    o[:y] = 4
+    o.changed_columns.should == [:y]
+    o.save(:x)
+    o.changed_columns.should == [:y]
+    o.save(:y)
+    o.changed_columns.should == []
+  end
+end
+
+context "Model#save_changes" do
+  setup do
+    MODEL_DB.reset
+
+    @c = Class.new(Sequel::Model(:items)) do
+      def columns
+        [:id, :x, :y]
+      end
+    end
+  end
+  
+  specify "should do nothing if no changed columns" do
+    o = @c.new(:id => 3, :x => 1, :y => nil)
+    o.save_changes
+    
+    MODEL_DB.sqls.should be_empty
+  end
+  
+  specify "should update only changed columns" do
+    o = @c.new(:id => 3, :x => 1, :y => nil)
+    o.x = 2
+
+    o.save_changes
+    MODEL_DB.sqls.should == ["UPDATE items SET x = 2 WHERE (id = 3)"]
+    o.save_changes
+    o.save_changes
+    MODEL_DB.sqls.should == ["UPDATE items SET x = 2 WHERE (id = 3)"]
+    MODEL_DB.reset
+
+    o.y = 4
+    o.save_changes
+    MODEL_DB.sqls.should == ["UPDATE items SET y = 4 WHERE (id = 3)"]
+    o.save_changes
+    o.save_changes
+    MODEL_DB.sqls.should == ["UPDATE items SET y = 4 WHERE (id = 3)"]
+  end
+end
+
 context "Model#new?" do
   setup do
     MODEL_DB.reset

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.4.1.3
+  version: 0.4.2
 platform: ruby
 authors: 
 - Sharon Rosner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-05 00:00:00 +02:00
+date: 2007-12-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,6 +54,7 @@ files:
 - README
 - Rakefile
 - bin/sequel
+- doc/rdoc
 - spec/adapters
 - spec/adapters/informix_spec.rb
 - spec/adapters/mysql_spec.rb
@@ -76,10 +77,12 @@ files:
 - spec/worker_spec.rb
 - lib/sequel
 - lib/sequel/adapters
+- lib/sequel/adapters/adapter_skeleton.rb
 - lib/sequel/adapters/ado.rb
 - lib/sequel/adapters/db2.rb
 - lib/sequel/adapters/dbi.rb
 - lib/sequel/adapters/informix.rb
+- lib/sequel/adapters/jdbc.rb
 - lib/sequel/adapters/mysql.rb
 - lib/sequel/adapters/odbc.rb
 - lib/sequel/adapters/odbc_mssql.rb