sequel 0.4.2 → 0.4.2.1

data/CHANGELOG

@@ -1,3 +1,17 @@
+=== 0.4.2.1 (2007-12-09)
+
+* Refactored and fixed Dataset#reverse_order to work with field quoting (thanks Christian).
+
+* Fixed problem with field quoting in insert statements.
+
+* Changed sequelizer code to silently fail on any error when requiring parsetree and ruby2ruby.
+
+* Added Database#create_view, #create_or_replace_view and #drop_view methods. Also implemented Dataset#create_view and #create_or_replace_view convenience methods.
+
+* Keep DRY by re-using Model#[]= from method_missing.
+
+* Added Model.fetch alias for DB.fetch.set_model(Model)
+
 === 0.4.2 (2007-12-07)
 
 * Implemented Model#save_changes.

data/Rakefile

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

data/lib/sequel/adapters/odbc_mssql.rb

@@ -7,7 +7,6 @@ module Sequel
     module MSSQL
       class Database < ODBC::Database
         set_adapter_scheme :odbc_mssql
-#        set_adapter_scheme :"odbc-mssql"
         
         def dataset(opts = nil)
           MSSQL::Dataset.new(self, opts)

data/lib/sequel/core_sql.rb

@@ -59,6 +59,7 @@ module Sequel
     end
     
     class ColumnExpr < Expression
+      attr_reader :l, :op, :r
       def initialize(l, op, r = nil); @l, @op, @r = l, op, r; end
       
       def to_s(ds)

data/lib/sequel/database.rb

@@ -194,6 +194,20 @@ module Sequel
       false
     end
     
+    def create_view(name, source)
+      source = source.sql if source.is_a?(Dataset)
+      execute("CREATE VIEW #{name} AS #{source}")
+    end
+    
+    def create_or_replace_view(name, source)
+      source = source.sql if source.is_a?(Dataset)
+      execute("CREATE OR REPLACE VIEW #{name} AS #{source}")
+    end
+    
+    def drop_view(name)
+      execute("DROP VIEW #{name}")
+    end
+    
     SQL_BEGIN = 'BEGIN'.freeze
     SQL_COMMIT = 'COMMIT'.freeze
     SQL_ROLLBACK = 'ROLLBACK'.freeze

data/lib/sequel/dataset/convenience.rb

@@ -304,6 +304,14 @@ module Sequel
         end
         nil
       end
+      
+      def create_view(name)
+        @db.create_view(name, self)
+      end
+      
+      def create_or_replace_view(name)
+        @db.create_or_replace_view(name, self)
+      end
     end
   end
 end

data/lib/sequel/dataset/sequelizer.rb

@@ -263,7 +263,7 @@ end
 
 begin
   require 'parse_tree'
-rescue LoadError
+rescue Exception
   module Sequel::Dataset::Sequelizer
     def proc_to_sql(proc)
       raise SequelError, "You must have the ParseTree gem installed in order to use block filters."
@@ -273,7 +273,7 @@ end
 
 begin
   require 'ruby2ruby'
-rescue LoadError
+rescue Exception
   module Sequel::Dataset::Sequelizer
     def ext_expr(e)
       raise SequelError, "You must have the Ruby2Ruby gem installed in order to use this block filter."

data/lib/sequel/dataset/sql.rb

@@ -152,28 +152,21 @@ module Sequel
         order(*invert_order(order.empty? ? @opts[:order] : order))
       end
 
-      DESC_ORDER_REGEXP = /^(.*)\sDESC$/i.freeze
-
       # Inverts the given order by breaking it into a list of column references
       # and inverting them.
       #
-      #   dataset.invert_order(['id DESC']) #=> ["id"]
-      #   dataset.invert_order(['category, price DESC']) #=>
-      #     ["category DESC, price"]
+      #   dataset.invert_order([:id.desc]]) #=> [:id]
+      #   dataset.invert_order(:category, :price.desc]) #=>
+      #     [:category.desc, :price]
       def invert_order(order)
         new_order = []
-        order.each do |f|
-          if f.is_a?(String)
-            f.split(',').each do |r|
-              r.strip!
-              new_order << ((r =~ DESC_ORDER_REGEXP ? $1 : r.to_sym.desc).lit)
-            end
+        order.map do |f|
+          if f.is_a?(Sequel::SQL::ColumnExpr) && (f.op == Sequel::SQL::ColumnMethods::DESC)
+            f.l
           else
-            r = literal(f).strip
-            new_order << ((r =~ DESC_ORDER_REGEXP ? $1 : r.to_sym.desc).lit)
+            f.desc
           end
         end
-        new_order
       end
 
       # Returns a copy of the dataset with the results grouped by the value of 
@@ -442,7 +435,7 @@ module Sequel
             if values.empty?
               "INSERT INTO #{@opts[:from]} DEFAULT VALUES"
             elsif values.keys
-              fl = values.keys
+              fl = values.keys.map {|f| literal(f.to_sym)}
               vl = transform_save(values.values).map {|v| literal(v)}
               "INSERT INTO #{@opts[:from]} (#{fl.join(COMMA_SEPARATOR)}) VALUES (#{vl.join(COMMA_SEPARATOR)})"
             else
@@ -454,7 +447,7 @@ module Sequel
               "INSERT INTO #{@opts[:from]} DEFAULT VALUES"
             else
               fl, vl = [], []
-              values.each {|k, v| fl << k.to_s; vl << literal(v)}
+              values.each {|k, v| fl << literal(k.to_sym); vl << literal(v)}
               "INSERT INTO #{@opts[:from]} (#{fl.join(COMMA_SEPARATOR)}) VALUES (#{vl.join(COMMA_SEPARATOR)})"
             end
           when Dataset

data/lib/sequel/model.rb

@@ -259,6 +259,10 @@ module Sequel
       dataset[(Hash === args) ? args : primary_key_hash(args)]
     end
     
+    def self.fetch(*args)
+      db.fetch(*args).set_model(self)
+    end
+
     # Like find but invokes create with given conditions when record does not
     # exists.
     def self.find_or_create(cond)

data/lib/sequel/model/record.rb

@@ -284,12 +284,9 @@ module Sequel
         # define the column accessor
         Thread.exclusive do
           if write
-            model.class_def(m) do |v|
-              @values[att] = v
-              @changed_columns << att unless @changed_columns.include?(att)
-            end
+            model.class_def(m) {|v| self[att] = v}
           else
-            model.class_def(m) {@values[att]}
+            model.class_def(m) {self[att]}
           end
         end
         

data/spec/adapters/mysql_spec.rb

@@ -96,7 +96,7 @@ context "A MySQL dataset" do
 
     @d.order(:name.DESC).sql.should == \
       'SELECT * FROM items ORDER BY `name` DESC'
-      
+
     @d.select('items.name AS item_name'.lit).sql.should == \
       'SELECT items.name AS item_name FROM items'
       
@@ -118,8 +118,22 @@ context "A MySQL dataset" do
     @d.insert_sql(:value => 333).should == \
       'INSERT INTO items (`value`) VALUES (333)'
 
-      @d.insert_sql(:x => :y).should == \
-        'INSERT INTO items (`x`) VALUES (`y`)'
+    @d.insert_sql(:x => :y).should == \
+      'INSERT INTO items (`x`) VALUES (`y`)'
+  end
+  
+  specify "should quote fields correctly when reversing the order" do
+    @d.reverse_order(:name).sql.should == \
+      'SELECT * FROM items ORDER BY `name` DESC'
+
+    @d.reverse_order(:name.DESC).sql.should == \
+      'SELECT * FROM items ORDER BY `name`'
+
+    @d.reverse_order(:name, :test.DESC).sql.should == \
+      'SELECT * FROM items ORDER BY `name` DESC, `test`'
+
+    @d.reverse_order(:name.DESC, :test).sql.should == \
+      'SELECT * FROM items ORDER BY `name`, `test` DESC'
   end
   
   specify "should support ORDER clause in UPDATE statements" do

data/spec/database_spec.rb

@@ -600,4 +600,49 @@ context "Database#[]" do
     @db['select * from xyz where x = ? and y = ?', 15, 'abc'].each {|r| sql = r[:sql]}
     sql.should == "select * from xyz where x = 15 and y = 'abc'"
   end
-end
+end
+
+context "Database#create_view" do
+  setup do
+    @db = DummyDatabase.new
+  end
+  
+  specify "should construct proper SQL with raw SQL" do
+    @db.create_view :test, "SELECT * FROM xyz"
+    @db.sqls.should == ['CREATE VIEW test AS SELECT * FROM xyz']
+  end
+  
+  specify "should construct proper SQL with dataset" do
+    @db.create_view :test, @db[:items].select(:a, :b).order(:c)
+    @db.sqls.should == ['CREATE VIEW test AS SELECT a, b FROM items ORDER BY c']
+  end
+end
+
+context "Database#create_or_replace_view" do
+  setup do
+    @db = DummyDatabase.new
+  end
+  
+  specify "should construct proper SQL with raw SQL" do
+    @db.create_or_replace_view :test, "SELECT * FROM xyz"
+    @db.sqls.should == ['CREATE OR REPLACE VIEW test AS SELECT * FROM xyz']
+  end
+
+  specify "should construct proper SQL with dataset" do
+    @db.create_or_replace_view :test, @db[:items].select(:a, :b).order(:c)
+    @db.sqls.should == ['CREATE OR REPLACE VIEW test AS SELECT a, b FROM items ORDER BY c']
+  end
+end
+
+context "Database#drop_view" do
+  setup do
+    @db = DummyDatabase.new
+  end
+  
+  specify "should construct proper SQL" do
+    @db.drop_view :test
+    @db.sqls.should == ['DROP VIEW test']
+  end
+end
+
+

data/spec/dataset_spec.rb

@@ -752,7 +752,7 @@ context "Dataset#reverse_order" do
   specify "should reverse a previous ordering if no arguments are given" do
     @dataset.order(:name).reverse_order.sql.should ==
       'SELECT * FROM test ORDER BY name DESC'
-    @dataset.order('clumsy DESC, fool').reverse_order.sql.should ==
+    @dataset.order(:clumsy.DESC, :fool).reverse_order.sql.should ==
       'SELECT * FROM test ORDER BY clumsy, fool DESC'
   end
 end
@@ -2278,4 +2278,47 @@ context "Dataset magic methods" do
     @ds.last_by_name('sharon').should == {:a => 1, :b => 2}
     @c.sqls.should == ["SELECT * FROM items ORDER BY name DESC LIMIT 1"] * 2
   end
-end
+end
+
+context "Dataset#create_view" do
+  setup do
+    @dbc = Class.new(Sequel::Database) do
+      attr_reader :sqls
+      
+      def execute(sql)
+        @sqls ||= []
+        @sqls << sql
+      end
+    end
+    @db = @dbc.new
+    
+    @ds = @db[:items].order(:abc).filter(:category => 'ruby')
+  end
+  
+  specify "should create a view with the dataset's sql" do
+    @ds.create_view(:xyz)
+    @db.sqls.should == ["CREATE VIEW xyz AS #{@ds.sql}"]
+  end
+end
+
+context "Dataset#create_or_replace_view" do
+  setup do
+    @dbc = Class.new(Sequel::Database) do
+      attr_reader :sqls
+      
+      def execute(sql)
+        @sqls ||= []
+        @sqls << sql
+      end
+    end
+    @db = @dbc.new
+    
+    @ds = @db[:items].order(:abc).filter(:category => 'ruby')
+  end
+  
+  specify "should create a view with the dataset's sql" do
+    @ds.create_or_replace_view(:xyz)
+    @db.sqls.should == ["CREATE OR REPLACE VIEW xyz AS #{@ds.sql}"]
+  end
+end
+

data/spec/model_spec.rb

@@ -724,6 +724,17 @@ context "Model.[]" do
   end
 end
 
+context "Model.fetch" do
+  setup do
+    MODEL_DB.reset
+    @c = Class.new(Sequel::Model(:items))
+  end
+  
+  specify "should return instances of Model" do
+    @c.fetch("SELECT * FROM items").first.should be_a_kind_of(@c)
+  end
+end
+
 context "A cached model" 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.2
+  version: 0.4.2.1
 platform: ruby
 authors: 
 - Sharon Rosner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-07 00:00:00 +02:00
+date: 2007-12-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency