sequel 2.3.0 → 2.4.0

data/spec/sequel_core/spec_helper.rb

@@ -27,7 +27,7 @@ class MockDatabase < Sequel::Database
   @@quote_identifiers = false
   attr_reader :sqls
   
-  def execute(sql)
+  def execute(sql, opts={})
     @sqls ||= []
     @sqls << sql
   end
@@ -44,7 +44,7 @@ end
 class SchemaDummyDatabase < Sequel::Database
   attr_reader :sqls
   
-  def execute(sql)
+  def execute(sql, opts={})
     @sqls ||= []
     @sqls << sql
   end

data/spec/sequel_model/model_spec.rb

@@ -519,12 +519,6 @@ describe Sequel::Model, ".[]" do
     $sqls.last.should == "SELECT * FROM items WHERE (id = 9999) LIMIT 1"
   end
 
-  it "should raise for boolean argument (mistaken comparison)" do
-    # This in order to prevent stuff like Model[:a == 'b']
-    proc {@c[:a == 1]}.should raise_error(Sequel::Error)
-    proc {@c[:a != 1]}.should raise_error(Sequel::Error)
-  end
-
   it "should work correctly for custom primary key" do
     @c.set_primary_key :name
     @c['sharon'].should be_a_kind_of(@c)

data/spec/sequel_model/spec_helper.rb

@@ -36,7 +36,7 @@ class MockDatabase < Sequel::Database
   @@quote_identifiers = false
   attr_reader :sqls
   
-  def execute(sql)
+  def execute(sql, opts={})
     @sqls ||= []
     @sqls << sql
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-25 00:00:00 -07:00
+date: 2008-08-06 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -26,6 +26,8 @@ extra_rdoc_files:
 - doc/advanced_associations.rdoc
 - doc/cheat_sheet.rdoc
 - doc/dataset_filtering.rdoc
+- doc/prepared_statements.rdoc
+- doc/sharding.rdoc
 files: 
 - COPYING
 - CHANGELOG
@@ -35,6 +37,8 @@ files:
 - doc/advanced_associations.rdoc
 - doc/cheat_sheet.rdoc
 - doc/dataset_filtering.rdoc
+- doc/prepared_statements.rdoc
+- doc/sharding.rdoc
 - spec/adapters
 - spec/adapters/informix_spec.rb
 - spec/adapters/mysql_spec.rb
@@ -81,11 +85,11 @@ files:
 - spec/integration/dataset_test.rb
 - spec/integration/schema_test.rb
 - spec/integration/type_test.rb
+- spec/integration/prepared_statement_test.rb
 - lib/sequel.rb
 - lib/sequel_core.rb
 - lib/sequel_core
 - lib/sequel_core/adapters
-- lib/sequel_core/adapters/adapter_skeleton.rb
 - lib/sequel_core/adapters/ado.rb
 - lib/sequel_core/adapters/db2.rb
 - lib/sequel_core/adapters/dbi.rb
@@ -93,18 +97,18 @@ files:
 - lib/sequel_core/adapters/jdbc.rb
 - lib/sequel_core/adapters/mysql.rb
 - lib/sequel_core/adapters/odbc.rb
-- lib/sequel_core/adapters/odbc_mssql.rb
 - lib/sequel_core/adapters/openbase.rb
 - lib/sequel_core/adapters/oracle.rb
 - lib/sequel_core/adapters/postgres.rb
 - lib/sequel_core/adapters/sqlite.rb
 - lib/sequel_core/adapters/shared
+- lib/sequel_core/adapters/shared/mysql.rb
+- lib/sequel_core/adapters/shared/mssql.rb
 - lib/sequel_core/adapters/shared/postgres.rb
 - lib/sequel_core/adapters/shared/sqlite.rb
-- lib/sequel_core/adapters/shared/mysql.rb
 - lib/sequel_core/adapters/jdbc
-- lib/sequel_core/adapters/jdbc/postgresql.rb
 - lib/sequel_core/adapters/jdbc/mysql.rb
+- lib/sequel_core/adapters/jdbc/postgresql.rb
 - lib/sequel_core/adapters/jdbc/sqlite.rb
 - lib/sequel_core/connection_pool.rb
 - lib/sequel_core/core_ext.rb
@@ -120,6 +124,7 @@ files:
 - lib/sequel_core/dataset/query.rb
 - lib/sequel_core/dataset/schema.rb
 - lib/sequel_core/dataset/sql.rb
+- lib/sequel_core/dataset/prepared_statements.rb
 - lib/sequel_core/deprecated.rb
 - lib/sequel_core/exceptions.rb
 - lib/sequel_core/migration.rb

data/lib/sequel_core/adapters/adapter_skeleton.rb

@@ -1,54 +0,0 @@
-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)
-        log_info(sql)
-        @pool.hold {|conn| conn.exec(sql)}
-      end
-    end
-    
-    class Dataset < Sequel::Dataset
-      def literal(v)
-        case v
-        when Time
-          literal(v.iso8601)
-        when Date, DateTime
-          literal(v.to_s)
-        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
-    end
-  end
-end

data/lib/sequel_core/adapters/odbc_mssql.rb

@@ -1,106 +0,0 @@
-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
-        
-        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(: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 Error, "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 (#{expression_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]
-            join.each{|j| sql << literal(j)}
-          end
-
-          if where = opts[:where]
-            sql << " WHERE #{literal(where)}"
-          end
-
-          if group = opts[:group]
-            sql << " GROUP BY #{expression_list(group)}"
-          end
-
-          if order = opts[:order]
-            sql << " ORDER BY #{expression_list(order)}"
-          end
-
-          if having = opts[:having]
-            sql << " HAVING #{literal(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
-        
-        def full_text_search(cols, terms, opts = {})
-          filter("CONTAINS (#{literal(cols)}, #{literal(terms)})")
-        end
-
-        def complex_expression_sql(op, args)
-          case op
-          when :'||'
-            super(:+, args)
-          else
-            super(op, args)
-          end
-        end
-      end
-    end
-  end
-end