sequel 0.4.1.1 → 0.4.1.2

data/CHANGELOG

@@ -1,3 +1,13 @@
+== 0.4.1.2 (2007-12-04)
+
+* Changed Model.is to accept variable arity.
+
+* Implemented plugin loading for model classes.
+
+* Fixed odbc-mssql and odbc adapters (thanks Dusty.)
+
+* Implemented odbc-mssql adapter (thanks Dusty.)
+
 === 0.4.1.1 (2007-11-27)
 
 * Fixed #first and #last functionality in Informix::Dataset (thanks Gerardo Santana).

data/Rakefile

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

data/lib/sequel/adapters/odbc.rb

@@ -50,7 +50,7 @@ module Sequel
 
       def fetch_rows(sql, &block)
         @db.synchronize do
-          s = @db.execute select_sql(sql)
+          s = @db.execute sql
           begin
             @columns = s.columns(true).map {|c| c.name.to_sym}
             rows = s.fetch_all

data/lib/sequel/adapters/odbc_mssql.rb

@@ -0,0 +1,98 @@
+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
+
+module Sequel
+  module ODBC
+    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)
+        end
+      end
+      
+      class Dataset < ODBC::Dataset
+        # Allows you to do .nolock on a query
+        def nolock
+          clone_merge(:with => "(NOLOCK)")
+        end
+
+        # Formats a SELECT statement using the given options and the dataset
+        # options.
+        def select_sql(opts = nil)
+          opts = opts ? @opts.merge(opts) : @opts
+
+          if sql = opts[:sql]
+            return sql
+          end
+
+          # ADD TOP to SELECT string for LIMITS
+          if limit = opts[:limit]
+            top = "TOP #{limit} "
+            raise SequelError, "Offset not supported" if opts[:offset]
+          end
+
+          columns = opts[:select]
+          select_columns = columns ? column_list(columns) : WILDCARD
+
+          if distinct = opts[:distinct]
+            distinct_clause = distinct.empty? ? "DISTINCT" : "DISTINCT ON (#{column_list(distinct)})"
+            sql = "SELECT #{top}#{distinct_clause} #{select_columns}"
+          else
+            sql = "SELECT #{top}#{select_columns}"
+          end
+
+          if opts[:from]
+            sql << " FROM #{source_list(opts[:from])}"
+          end
+
+          # ADD WITH to SELECT string for NOLOCK
+          if with = opts[:with]
+            sql << " WITH #{with}"
+          end
+
+          if join = opts[:join]
+            sql << join
+          end
+
+          if where = opts[:where]
+            sql << " WHERE #{where}"
+          end
+
+          if group = opts[:group]
+            sql << " GROUP BY #{column_list(group)}"
+          end
+
+          if order = opts[:order]
+            sql << " ORDER BY #{column_list(order)}"
+          end
+
+          if having = opts[:having]
+            sql << " HAVING #{having}"
+          end
+
+          if union = opts[:union]
+            sql << (opts[:union_all] ? \
+              " UNION ALL #{union.sql}" : " UNION #{union.sql}")
+          elsif intersect = opts[:intersect]
+            sql << (opts[:intersect_all] ? \
+              " INTERSECT ALL #{intersect.sql}" : " INTERSECT #{intersect.sql}")
+          elsif except = opts[:except]
+            sql << (opts[:except_all] ? \
+              " EXCEPT ALL #{except.sql}" : " EXCEPT #{except.sql}")
+          end
+
+          sql
+        end
+        alias_method :sql, :select_sql
+      end
+    end
+  end
+end

data/lib/sequel/database.rb

@@ -257,6 +257,7 @@ module Sequel
     end
     
     def self.adapter_class(scheme)
+      scheme = scheme.to_s =~ /\-/ ? scheme.to_s.gsub('-', '_').to_sym : scheme.to_sym
       unless c = @@adapters[scheme.to_sym]
         require File.join(File.dirname(__FILE__), "adapters/#{scheme}")
         c = @@adapters[scheme.to_sym]

data/lib/sequel/dataset/sql.rb

@@ -420,7 +420,7 @@ module Sequel
 
         sql
       end
-      alias sql select_sql
+      alias_method :sql, :select_sql
 
       # Formats an INSERT statement using the given values. If a hash is given,
       # the resulting statement includes column names. If no values are given, 

data/lib/sequel/model.rb

@@ -235,21 +235,15 @@ require File.join(File.dirname(__FILE__), 'model/record')
 require File.join(File.dirname(__FILE__), 'model/schema')
 require File.join(File.dirname(__FILE__), 'model/relations')
 require File.join(File.dirname(__FILE__), 'model/caching')
+require File.join(File.dirname(__FILE__), 'model/plugins')
 
 module Sequel
   class Model
-
     # Defines a method that returns a filtered dataset.
     def self.subset(name, *args, &block)
       dataset.meta_def(name) {filter(*args, &block)}
     end
-
-    # Comprehensive description goes here!
-    def primary_key_hash(value)
-      # stock implementation
-      {:id => value}
-    end
-
+    
     # Finds a single record according to the supplied filter, e.g.:
     #
     #   Ticket.find :author => 'Sharon' # => record
@@ -310,42 +304,5 @@ module Sequel
     def self.all
       dataset.all
     end
-
-    # Returns value of attribute.
-    def [](column)
-      @values[column]
-    end
-    # Sets value of attribute.
-    def []=(column, value)
-      @values[column] = value
-    end
-
-    # Enumerates through all attributes.
-    #
-    # === Example:
-    #   Ticket.find(7).each { |k, v| puts "#{k} => #{v}" }
-    def each(&block)
-      @values.each(&block)
-    end
-    # Returns attribute names.
-    def keys
-      @values.keys
-    end
-
-    # Returns value for <tt>:id</tt> attribute.
-    def id
-      @values[:id]
-    end
-
-    # Compares model instances by values.
-    def ==(obj)
-      (obj.class == model) && (obj.values == @values)
-    end
-
-    # Compares model instances by pkey.
-    def ===(obj)
-      (obj.class == model) && (obj.pk == pk)
-    end
-
   end
 end

data/lib/sequel/model/plugins.rb

@@ -0,0 +1,29 @@
+module Sequel
+  module Plugins; end
+  
+  class Model
+    class << self
+      # Loads a plugin for use with the model class, passing optional arguments
+      # to the plugin.
+      def is(plugin, *args)
+        plugin_module(plugin).apply(self, *args)
+      end
+      alias_method :is_a, :is
+    
+      # Returns the module for the specified plugin. If the module is not 
+      # defined, the corresponding plugin gem is automatically loaded.
+      def plugin_module(plugin)
+        module_name = plugin.to_s.gsub(/(^|_)(.)/) {$2.upcase}
+        if not Sequel::Plugins.const_defined?(module_name)
+          require plugin_gem(plugin)
+        end
+        Sequel::Plugins.const_get(module_name)
+      end
+
+      # Returns the gem name for the given plugin.
+      def plugin_gem(plugin)
+        "sequel_#{plugin}"
+      end
+    end
+  end
+end

data/lib/sequel/model/record.rb

@@ -2,6 +2,42 @@ module Sequel
   class Model
     attr_reader :values
 
+    # Returns value of attribute.
+    def [](column)
+      @values[column]
+    end
+    # Sets value of attribute.
+    def []=(column, value)
+      @values[column] = value
+    end
+
+    # Enumerates through all attributes.
+    #
+    # === Example:
+    #   Ticket.find(7).each { |k, v| puts "#{k} => #{v}" }
+    def each(&block)
+      @values.each(&block)
+    end
+    # Returns attribute names.
+    def keys
+      @values.keys
+    end
+
+    # Returns value for <tt>:id</tt> attribute.
+    def id
+      @values[:id]
+    end
+
+    # Compares model instances by values.
+    def ==(obj)
+      (obj.class == model) && (obj.values == @values)
+    end
+
+    # Compares model instances by pkey.
+    def ===(obj)
+      (obj.class == model) && (obj.pk == pk)
+    end
+
     # Returns key for primary key.
     def self.primary_key
       :id

data/spec/model_spec.rb

@@ -1039,4 +1039,42 @@ context "Model magic methods" do
     @m.last_by_name('sharon').values.should == {:id => 123, :name => 'hey'}
     @c.sqls.should == ["SELECT * FROM items ORDER BY name DESC LIMIT 1"] * 2
   end
+end
+
+module Sequel::Plugins
+  module Timestamped
+    def self.apply(m, opts)
+      m.class_def(:get_stamp) {@values[:stamp]}
+      m.meta_def(:stamp_opts) {opts}
+      m.before_save {@values[:stamp] = Time.now}
+    end
+  end
+end
+
+context "A model using a plugin" do
+  specify "should fail if the plugin is not found" do
+    proc do
+      c = Class.new(Sequel::Model) do
+        is :something_or_other
+      end
+    end.should raise_error(LoadError)
+  end
+  
+  specify "should apply the plugin to the class" do
+    c = nil
+    proc do
+      c = Class.new(Sequel::Model) do
+        is :timestamped, :a => 1, :b => 2
+      end
+    end.should_not raise_error(LoadError)
+    
+    c.should respond_to(:stamp_opts)
+    c.stamp_opts.should == {:a => 1, :b => 2}
+    
+    m = c.new
+    m.should respond_to(:get_stamp)
+    t = Time.now
+    m[:stamp] = t
+    m.get_stamp.should == t
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.4.1.1
+  version: 0.4.1.2
 platform: ruby
 authors: 
 - Sharon Rosner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-11-27 00:00:00 +02:00
+date: 2007-12-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,7 @@ files:
 - lib/sequel/adapters/informix.rb
 - lib/sequel/adapters/mysql.rb
 - lib/sequel/adapters/odbc.rb
+- lib/sequel/adapters/odbc_mssql.rb
 - lib/sequel/adapters/oracle.rb
 - lib/sequel/adapters/postgres.rb
 - lib/sequel/adapters/sqlite.rb
@@ -105,6 +106,7 @@ files:
 - lib/sequel/model/base.rb
 - lib/sequel/model/caching.rb
 - lib/sequel/model/hooks.rb
+- lib/sequel/model/plugins.rb
 - lib/sequel/model/record.rb
 - lib/sequel/model/relations.rb
 - lib/sequel/model/schema.rb