sequel_core 1.2 → 1.2.1

data/CHANGELOG

@@ -1,3 +1,23 @@
+=== 1.2.1 (2008-02-29)
+
+* Added add_constraint and drop_constraint functionality to Database#alter_table (#182).
+
+* Enhanced Dataset#multi_insert to accept datasets (#179).
+
+* Added MySQL::Database#use method for switching database (#180).
+
+* Enhanced Database.uri_to_options to accept uri strings (#178).
+
+* Added Dataset#columns! method that always makes a roundtrip to the DB (#177).
+
+* Added new Dataset#each_page method that iterates over all pages in the result set (#175).
+
+* Added Dataset#reverse alias to Dataset#reverse_order (#174).
+
+* Fixed Dataset#transform_load and #transform_save to create a trasnformed copy of the supplied hash instead of transforming it in place (#184).
+
+* Implemented MySQL::Dataset#replace (#163).
+
 === 1.2 (2008-02-15)
 
 * Added support for :varchar[100] like type declarations in #create_table.

data/Rakefile

@@ -9,7 +9,7 @@ include FileUtils
 # Configuration
 ##############################################################################
 NAME = "sequel_core"
-VERS = "1.2"
+VERS = "1.2.1"
 CLEAN.include ["**/.*.sw?", "pkg/*", ".config", "doc/*", "coverage/*"]
 RDOC_OPTS = [
   "--quiet", 

data/lib/sequel_core/adapters/mysql.rb

@@ -204,6 +204,14 @@ module Sequel
           end
         end
       end
+
+      # Changes the database in use by issuing a USE statement.
+      def use(db_name)
+        disconnect
+        @opts[:database] = db_name
+        self << "USE #{db_name}"
+        self
+      end
     end
 
     class Dataset < Sequel::Dataset
@@ -314,7 +322,7 @@ module Sequel
       end
 
       # MySQL supports ORDER and LIMIT clauses in UPDATE statements.
-      def update_sql(values, opts = nil)
+      def update_sql(values, opts = nil, &block)
         sql = super
         opts = opts ? @opts.merge(opts) : @opts
 
@@ -328,6 +336,42 @@ module Sequel
         sql
       end
       
+      def replace_sql(*values)
+        if values.empty?
+          "REPLACE INTO #{@opts[:from]} DEFAULT VALUES"
+        else
+          values = values[0] if values.size == 1
+          case values
+          when Sequel::Model
+            insert_sql(values.values)
+          when Array
+            if values.empty?
+              "REPLACE INTO #{@opts[:from]} DEFAULT VALUES"
+            elsif values.keys
+              fl = values.keys.map {|f| literal(f.is_a?(String) ? f.to_sym : f)}
+              vl = @transform ? transform_save(values.values) : values.values
+              vl.map! {|v| literal(v)}
+              "REPLACE INTO #{@opts[:from]} (#{fl.join(COMMA_SEPARATOR)}) VALUES (#{vl.join(COMMA_SEPARATOR)})"
+            else
+              "REPLACE INTO #{@opts[:from]} VALUES (#{literal(values)})"
+            end
+          when Hash
+            values = transform_save(values) if @transform
+            if values.empty?
+              "REPLACE INTO #{@opts[:from]} DEFAULT VALUES"
+            else
+              fl, vl = [], []
+              values.each {|k, v| fl << literal(k.is_a?(String) ? k.to_sym : k); vl << literal(v)}
+              "REPLACE INTO #{@opts[:from]} (#{fl.join(COMMA_SEPARATOR)}) VALUES (#{vl.join(COMMA_SEPARATOR)})"
+            end
+          when Dataset
+            "REPLACE INTO #{@opts[:from]} #{literal(values)}"
+          else
+            "REPLACE INTO #{@opts[:from]} VALUES (#{literal(values)})"
+          end
+        end
+      end
+      
       # MySQL supports ORDER and LIMIT clauses in DELETE statements.
       def delete_sql(opts = nil)
         sql = super
@@ -350,7 +394,11 @@ module Sequel
       def update(*args, &block)
         @db.execute(update_sql(*args, &block)) {|c| c.affected_rows}
       end
-
+      
+      def replace(*args)
+        @db.execute(replace_sql(*args)) {|c| c.insert_id}
+      end
+      
       def delete(opts = nil)
         @db.execute(delete_sql(opts)) {|c| c.affected_rows}
       end

data/lib/sequel_core/array_keys.rb

@@ -62,7 +62,7 @@ module ArrayKeys
     # Converts the array into a hash.
     def to_hash
       h = {}
-      each_with_index {|v, i| h[@keys[i].to_sym] = v}
+      each_with_index {|v, i| h[(k = @keys[i]) ? k.to_sym : nil] = v}
       h
     end
     alias_method :to_h, :to_hash
@@ -238,6 +238,23 @@ module ArrayKeys
         end
       end
     end
+
+    def array_tuples_transform_load(r)
+      a = []; a.keys = []
+      r.each_pair do |k, v|
+        a[k] = (tt = @transform[k]) ? tt[0][v] : v
+      end
+      a
+    end
+    
+    # Applies the value transform for data saved to the database.
+    def array_tuples_transform_save(r)
+      a = []; a.keys = []
+      r.each_pair do |k, v|
+        a[k] = (tt = @transform[k]) ? tt[1][v] : v
+      end
+      a
+    end
   end
 end
 
@@ -266,9 +283,13 @@ module Sequel
         else
           alias_method :orig_each, :each
           alias_method :orig_update_each_method, :update_each_method
+          
           include ArrayKeys::DatasetExtensions
           alias_method :each, :array_tuples_each
           alias_method :update_each_method, :array_tuples_update_each_method
+
+          alias_method :transform_load, :array_tuples_transform_load
+          alias_method :transform_save, :array_tuples_transform_save
         end
       end
     end

data/lib/sequel_core/database.rb

@@ -379,6 +379,9 @@ module Sequel
     # Converts a uri to an options hash. These options are then passed
     # to a newly created database object.
     def self.uri_to_options(uri)
+      if uri.is_a?(String)
+        uri = URI.parse(uri)
+      end
       {
         :user => uri.user,
         :password => uri.password,

data/lib/sequel_core/dataset.rb

@@ -70,7 +70,7 @@ module Sequel
     include SQL
     include Convenience
     
-    attr_reader :db
+    attr_accessor :db
     attr_accessor :opts
     
     alias_method :size, :count
@@ -159,6 +159,11 @@ module Sequel
       @columns || []
     end
     
+    def columns!
+      first
+      @columns || []
+    end
+    
     # Inserts the supplied values into the associated table.
     def <<(*args)
       insert(*args)
@@ -352,22 +357,20 @@ module Sequel
     
     # Applies the value transform for data loaded from the database.
     def transform_load(r)
-      @transform.each do |k, tt|
-        if r.has_key?(k)
-          r[k] = tt[0][r[k]]
-        end
+      r.inject({}) do |m, kv|
+        k, v = *kv
+        m[k] = (tt = @transform[k]) ? tt[0][v] : v
+        m
       end
-      r
     end
     
     # Applies the value transform for data saved to the database.
     def transform_save(r)
-      @transform.each do |k, tt|
-        if r.has_key?(k)
-          r[k] = tt[1][r[k]]
-        end
+      r.inject({}) do |m, kv|
+        k, v = *kv
+        m[k] = (tt = @transform[k]) ? tt[1][v] : v
+        m
       end
-      r
     end
     
     # Updates the each method according to whether @row_proc and @transform are

data/lib/sequel_core/dataset/convenience.rb

@@ -123,6 +123,19 @@ module Sequel
         @pagination_record_count = record_count
         @page_count = (record_count / page_size.to_f).ceil
       end
+      
+      def each_page(page_size)
+        record_count = count
+        total_pages = (record_count / page_size.to_f).ceil
+        
+        (1..total_pages).each do |page_no|
+          paginated = limit(page_size, (page_no - 1) * page_size)
+          paginated.set_pagination_info(page_no, page_size, record_count)
+          yield paginated
+        end
+        
+        self
+      end
 
       attr_accessor :page_size, :page_count, :current_page, :pagination_record_count
 
@@ -246,6 +259,11 @@ module Sequel
           return
         elsif args[0].is_a?(Array) && args[1].is_a?(Array)
           columns, values, opts = *args
+        elsif args[0].is_a?(Array) && args[1].is_a?(Dataset)
+          table = @opts[:from].first
+          columns, dataset = *args
+          sql = "INSERT INTO #{table} (#{literal(columns)}) VALUES (#{dataset.sql})"
+          return @db.transaction {@db.execute sql}
         else
           # we assume that an array of hashes is given
           hashes, opts = *args

data/lib/sequel_core/dataset/sql.rb

@@ -214,6 +214,7 @@ module Sequel
       def reverse_order(*order)
         order(*invert_order(order.empty? ? @opts[:order] : order))
       end
+      alias_method :reverse, :reverse_order
 
       # Inverts the given order by breaking it into a list of column references
       # and inverting them.
@@ -544,7 +545,7 @@ module Sequel
       #
       # This method may be overriden by descendants.
       def multi_insert_sql(columns, values)
-        table = @opts[:from]
+        table = @opts[:from].first
         columns = literal(columns)
         values.map do |r|
           "INSERT INTO #{table} (#{columns}) VALUES (#{literal(r)})"

data/lib/sequel_core/schema/schema_generator.rb

@@ -147,6 +147,22 @@ module Sequel
           :columns => columns \
         }
       end
+
+      def add_constraint(name, *args, &block)
+        @operations << { \
+          :op => :add_constraint, \
+          :name => name, \
+          :type => :check, \
+          :check => block || args \
+        }
+      end
+
+      def drop_constraint(name)
+        @operations << { \
+          :op => :drop_constraint, \
+          :name => name \
+        }
+      end
     end
   end
 end

data/lib/sequel_core/schema/schema_sql.rb

@@ -143,6 +143,10 @@ module Sequel
           index_definition_sql(table, op)
         when :drop_index
           "DROP INDEX #{default_index_name(table, op[:columns])}"
+        when :add_constraint
+          "ALTER TABLE #{table} ADD #{constraint_definition_sql(op)}"
+        when :drop_constraint
+          "ALTER TABLE #{table} DROP CONSTRAINT #{literal(op[:name])}"
         else
           raise Error, "Unsupported ALTER TABLE operation"
         end

data/spec/adapters/mysql_spec.rb

@@ -563,4 +563,28 @@ context "MySQL::Dataset#multi_insert" do
       {:name => 'def', :value => 2}
     ]
   end
+end
+
+context "MySQL::Dataset#replace" do
+  setup do
+    MYSQL_DB.drop_table(:items) if MYSQL_DB.table_exists?(:items)
+    MYSQL_DB.create_table :items do
+      integer :id, :unique => true
+      integer :value, :index => true
+    end
+    @d = MYSQL_DB[:items]
+    MYSQL_DB.sqls.clear
+  end
+  
+  specify "should create a record if the condition is not met" do
+    @d.replace(:id => 111, :value => 333)
+    @d.all.should == [{:id => 111, :value => 333}]
+  end
+  
+  specify "should update a record if the condition is met" do
+    @d << {:id => 111}
+    @d.all.should == [{:id => 111, :value => nil}]
+    @d.replace(:id => 111, :value => 333)
+    @d.all.should == [{:id => 111, :value => 333}]
+  end
 end

data/spec/array_keys_spec.rb

@@ -552,6 +552,9 @@ context "Sequel.use_array_tuples" do
     a[:b].should == 2
     a[:c].should == 3
     a[:d].should == nil
+    
+    b = [12]; b.keys = [:a]
+    @ds.insert_sql(b).should == "INSERT INTO items (a) VALUES (2)"
   end
   
   specify "should work correctly with dataset with model" do

data/spec/database_spec.rb

@@ -579,6 +579,15 @@ context "Database#uri_to_options" do
     h[:port].should == 1234
     h[:database].should == 'blah'
   end
+
+  specify "should accept a string and convert it to an options hash" do
+    h = Sequel::Database.uri_to_options('ttt://uuu:ppp@192.168.60.1:1234/blah')
+    h[:user].should == 'uuu'
+    h[:password].should == 'ppp'
+    h[:host].should == '192.168.60.1'
+    h[:port].should == 1234
+    h[:database].should == 'blah'
+  end
 end
 
 context "A single threaded database" do

data/spec/dataset_spec.rb

@@ -854,6 +854,11 @@ context "Dataset#reverse_order" do
     @dataset.order(:clumsy.DESC, :fool).reverse_order.sql.should ==
       'SELECT * FROM test ORDER BY clumsy, fool DESC'
   end
+  
+  specify "should have #reverse alias" do
+    @dataset.order(:name).reverse.sql.should ==
+      'SELECT * FROM test ORDER BY name DESC'
+  end
 end
 
 context "Dataset#limit" do
@@ -2025,6 +2030,24 @@ context "A paginated dataset" do
   end
 end
 
+context "Dataset#each_page" do
+  setup do
+    @d = Sequel::Dataset.new(nil).from(:items)
+    @d.meta_def(:count) {153}
+  end
+  
+  specify "should iterate over each page in the resultset as a paginated dataset" do
+    a = []
+    @d.each_page(50) {|p| a << p}
+    a.map {|p| p.sql}.should == [
+      'SELECT * FROM items LIMIT 50 OFFSET 0',
+      'SELECT * FROM items LIMIT 50 OFFSET 50',
+      'SELECT * FROM items LIMIT 50 OFFSET 100',
+      'SELECT * FROM items LIMIT 50 OFFSET 150',
+    ]
+  end
+end
+
 context "Dataset#columns" do
   setup do
     @dataset = DummyDataset.new(nil).from(:items)
@@ -2045,6 +2068,21 @@ context "Dataset#columns" do
   end
 end
 
+context "Dataset#columns!" do
+  setup do
+    @dataset = DummyDataset.new(nil).from(:items)
+    @dataset.meta_def(:columns=) {|c| @columns = c}
+    @dataset.meta_def(:first) {@columns = select_sql(nil)}
+  end
+  
+  specify "should always call first" do
+    @dataset.columns = nil
+    @dataset.columns!.should == 'SELECT * FROM items'
+    @dataset.opts[:from] = [:nana]
+    @dataset.columns!.should == 'SELECT * FROM nana'
+  end
+end
+
 require 'stringio'
 
 context "Dataset#print" do
@@ -2146,6 +2184,17 @@ context "Dataset#multi_insert" do
     ]
   end
 
+  specify "should accept a columns array and a dataset" do
+    @ds2 = Sequel::Dataset.new(@db).from(:cats).filter(:purr => true).select(:a, :b)
+    
+    @ds.multi_insert([:x, :y], @ds2)
+    @db.sqls.should == [
+      'BEGIN',
+      "INSERT INTO items (x, y) VALUES (SELECT a, b FROM cats WHERE (purr = 't'))",
+      'COMMIT'
+    ]
+  end
+
   specify "should accept a columns array and a values array with slice option" do
     @ds.multi_insert([:x, :y], [[1, 2], [3, 4], [5, 6]], :slice => 2)
     @db.sqls.should == [
@@ -2385,6 +2434,12 @@ context "Dataset#transform" do
     @ds.each(:naked => true) {|r| f = r}
     f.should == {:x => "wow", :y => 'hello'}
   end
+  
+  specify "should leave the supplied values intact" do
+    h = {:x => :toast}
+    @ds.insert(h)
+    h.should == {:x => :toast}
+  end
 end
 
 context "Dataset#transform" do

data/spec/schema_generator_spec.rb

@@ -82,6 +82,8 @@ describe Sequel::Schema::AlterTableGenerator do
       add_index [:fff, :ggg]
       drop_index :hhh
       add_full_text_index :blah
+      add_constraint :con1, ':fred > 100'
+      drop_constraint :con2
     end
   end
   
@@ -94,7 +96,9 @@ describe Sequel::Schema::AlterTableGenerator do
       {:op => :set_column_default, :name => :eee, :default => 1},
       {:op => :add_index, :columns => [:fff, :ggg]},
       {:op => :drop_index, :columns => [:hhh]},
-      {:op => :add_index, :columns => [:blah], :full_text => true}
+      {:op => :add_index, :columns => [:blah], :full_text => true},
+      {:op => :add_constraint, :type => :check, :name => :con1, :check => [':fred > 100']},
+      {:op => :drop_constraint, :name => :con2}
     ]
   end
-end
+end

data/spec/schema_generator_spec.rb.rej

@@ -0,0 +1,35 @@
+***************
+*** 82,87 ****
+        add_index [:fff, :ggg]
+        drop_index :hhh
+        add_full_text_index :blah
+      end
+    end
+  
+--- 82,89 ----
+        add_index [:fff, :ggg]
+        drop_index :hhh
+        add_full_text_index :blah
++       add_constraint :con1, ':fred > 100'
++       drop_constraint :con2
+      end
+    end
+  
+***************
+*** 94,100 ****
+        {:op => :set_column_default, :name => :eee, :default => 1},
+        {:op => :add_index, :columns => [:fff, :ggg]},
+        {:op => :drop_index, :columns => [:hhh]},
+-       {:op => :add_index, :columns => [:blah], :full_text => true}
+      ]
+    end
+- end--- 96,104 ----
+        {:op => :set_column_default, :name => :eee, :default => 1},
+        {:op => :add_index, :columns => [:fff, :ggg]},
+        {:op => :drop_index, :columns => [:hhh]},
++       {:op => :add_index, :columns => [:blah], :full_text => true},
++       {:op => :add_constraint, :type => :check, :name => :con1, :check => [':fred > 100']},
++       {:op => :drop_constraint, :name => :con2}
+      ]
+    end
++ end

data/spec/schema_spec.rb

@@ -279,3 +279,30 @@ context "DB#drop_table" do
     @db.sqls.should == ['DROP TABLE cats']
   end
 end
+
+context "DB#alter_table" do
+  setup do
+    @db = SchemaDummyDatabase.new
+  end
+
+  specify "should accept add constraint definitions" do
+    @db.alter_table(:cats) do
+      add_constraint :valid_score, 'score <= 100'
+    end
+    @db.sqls.should == ["ALTER TABLE cats ADD CONSTRAINT valid_score CHECK (score <= 100)"]
+    @db.sqls.clear
+
+    @db.alter_table(:cats) do
+      add_constraint(:blah_blah) {:x > 0 && :y < 1}
+    end
+    @db.sqls.should == ["ALTER TABLE cats ADD CONSTRAINT blah_blah CHECK (((x > 0) AND (y < 1)))"]
+  end
+
+  specify "should accept drop constraint definitions" do
+    @db.alter_table(:cats) do
+      drop_constraint :valid_score
+    end
+    @db.sqls.should == ["ALTER TABLE cats DROP CONSTRAINT valid_score"]
+  end
+
+end

data/spec/schema_spec.rb.rej

@@ -0,0 +1,36 @@
+***************
+*** 279,281 ****
+      @db.sqls.should == ['DROP TABLE cats']
+    end
+  end
+--- 279,308 ----
+      @db.sqls.should == ['DROP TABLE cats']
+    end
+  end
++ 
++ context "DB#alter_table" do
++   setup do
++     @db = SchemaDummyDatabase.new
++   end
++ 
++   specify "should accept add constraint definitions" do
++     @db.alter_table(:cats) do
++       add_constraint :valid_score, 'score <= 100'
++     end
++     @db.sqls.should == ["ALTER TABLE cats ADD CONSTRAINT valid_score CHECK (score <= 100)"]
++     @db.sqls.clear
++ 
++     @db.alter_table(:cats) do
++       add_constraint(:blah_blah) {:x > 0 && :y < 1}
++     end
++     @db.sqls.should == ["ALTER TABLE cats ADD CONSTRAINT blah_blah CHECK (((x > 0) AND (y < 1)))"]
++   end
++ 
++   specify "should accept drop constraint definitions" do
++     @db.alter_table(:cats) do
++       drop_constraint :valid_score
++     end
++     @db.sqls.should == ["ALTER TABLE cats DROP CONSTRAINT valid_score"]
++   end
++ 
++ end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel_core
 version: !ruby/object:Gem::Version 
-  version: "1.2"
+  version: 1.2.1
 platform: ruby
 authors: 
 - Sharon Rosner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-16 00:00:00 +02:00
+date: 2008-02-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,7 +87,9 @@ files:
 - spec/pretty_table_spec.rb
 - spec/rcov.opts
 - spec/schema_generator_spec.rb
+- spec/schema_generator_spec.rb.rej
 - spec/schema_spec.rb
+- spec/schema_spec.rb.rej
 - spec/sequelizer_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb