sequel 4.15.0 → 4.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bed2efa61dbcb53c3a0ceb08e9ca858368631d35
-  data.tar.gz: 11da3e14b94c21e9719cd0d8a700e7f0727bc33b
+  metadata.gz: 505bc666a3de9a394dd0bb31e07afff6feca86da
+  data.tar.gz: 2082ac9b3731827b5c4e0c39859e8471e706a99d
 SHA512:
-  metadata.gz: a132e45671dda78cb933d50f21942ace99b938c3133d54b8dd82babe8fb5657f8c4f63ebb28dc1cd4c13bc08ee5a9736514a3be5ceb2c3dbcc4c7eeb09a5177f
-  data.tar.gz: a1e4be8380d22afda924e1fec932c47fb5be3f258279010753c12fc5dca9220f38b18b657e84a03875f9108572614292c150d8963ee8b0249eceff06df627d1b
+  metadata.gz: f728df92423ad2e207a2db67d89cc7c79819351973c348845978d7ba93826f33caf21b4251dec609c5fcc48c0c13b55460ac2800f7cd36b328d87463c804cc3a
+  data.tar.gz: 836ab1fb7bc23c595070f15dff4cf300b80d4b4eaf3e024c305d073a84a3a84c19782bef11359e9e96c0cb739206995ac8a4828ece1a5057c66a8c50fee0f87b

data/CHANGELOG

@@ -1,3 +1,25 @@
+=== 4.16.0 (2014-11-01)
+
+* Make Database#create_table? and #create_join_table? not use IF NOT EXISTS if indexes are being added (jeremyevans) (#904)
+
+* Dataset#distinct now accepts virtual row blocks (chanks) (#901)
+
+* Recognize disconnect errors in the postgres adapter when SSL is used (jeremyevans) (#900)
+
+* Stop converting '' default values to nil default values on MySQL (jeremyevans)
+
+* Add Model#qualified_pk_hash, for returning a hash with qualified pk keys (jeremyevans)
+
+* Make validates_unique use a qualified primary key if the dataset is joined (jeremyevans) (#895)
+
+* Make Sequel::Model.cache_associations = false skip the database's schema cache when loading the schema (jeremyevans)
+
+* Make Database#foreign_key_list work on Microsoft SQL Server 2005 (jeremyevans)
+
+* Make create_table with :foreign option reversible on PostgreSQL (jeremyevans)
+
+* Make drop_table with :foreign option on PostgreSQL drop a foreign table (johnnyt) (#892)
+
 === 4.15.0 (2014-10-01)
 
 * Make AssociationReflection#reciprocal not raise error if associated class contains association with invalid associated class (jeremyevans)

data/doc/association_basics.rdoc

@@ -191,7 +191,7 @@ specify an explicit :key option:
     many_to_one :artist, :key=>:artistid
   end
   class Artist
-    one_to_many :albumst, :key=>:artistid
+    one_to_many :albums, :key=>:artistid
   end
   
 For many_to_many associations, the :left_key and :right_key options can be

data/doc/migration.rdoc

@@ -358,7 +358,7 @@ you should give it some thought before using it.
 
 == Ignoring missing migrations
 
-In some cases, you may want to allow a migration in the database that does not exist in the filesystem (deploying to an older version of code without running a down migration when deploy auto-migrates, for example). If required, you can pass <tt>:allow_missing_migration_files => true<tt> as an option. This will stop errors from being raised if there are migrations in the database that do not exist in the filesystem.
+In some cases, you may want to allow a migration in the database that does not exist in the filesystem (deploying to an older version of code without running a down migration when deploy auto-migrates, for example). If required, you can pass <tt>:allow_missing_migration_files => true</tt> as an option. This will stop errors from being raised if there are migrations in the database that do not exist in the filesystem.
 
 == Modifying existing migrations
 

data/doc/release_notes/4.16.0.txt

@@ -0,0 +1,36 @@
+= New Features
+
+* Model#qualified_pk_hash has been added, which is similar to
+  Model#pk_hash, but uses qualified keys.
+
+* Dataset#distinct now accepts a virtual row block.
+
+* Database#drop_view with :foreign=>true option now drops foreign
+  tables on PostgreSQL.  Database#create_table with :foreign option
+  is now reversible on PostgreSQL.
+
+= Other Improvements
+
+* Sequel::Model.cache_associations = false now skips the database's
+  schema cache when loading the schema for a model.  This fixes
+  some issues in environments that use code reloading.
+
+* Database#create_table? and #create_join_table? no longer use
+  IF NOT EXISTS if indexes are being created.
+
+* Model.primary_key_hash and .qualified_primary_key_hash have been
+  optimized.
+
+* validates_unique in the validation_helpers plugin now uses a
+  qualified primary key if the model's dataset is joined.  This fixes
+  a case when the auto_validations and class_table_inheritance
+  plugins are used together.
+
+* Disconnect errors are now recognized in the postgres adapter when
+  SSL is used for connecting.
+
+* Empty string default values are no longer converted to nil default
+  values on MySQL.
+
+* Database#foreign_key_list now works correctly on Microsoft SQL
+  Server 2005.

data/lib/sequel/adapters/ado/access.rb

@@ -109,7 +109,7 @@ module Sequel
         def execute_insert(sql, opts=OPTS)
           synchronize(opts[:server]) do |conn|
             begin
-              r = log_yield(sql){conn.Execute(sql)}
+              log_yield(sql){conn.Execute(sql)}
               res = log_yield(LAST_INSERT_ID){conn.Execute(LAST_INSERT_ID)}
               res.getRows.transpose.each{|r| return r.shift}
             rescue ::WIN32OLERuntimeError => e

data/lib/sequel/adapters/cubrid.rb

@@ -124,7 +124,6 @@ module Sequel
       def fetch_rows(sql)
         execute(sql) do |stmt|
           begin
-            procs = 
             cols = stmt.column_info.map{|c| [output_identifier(c[COLUMN_INFO_NAME]), CUBRID_TYPE_PROCS[c[COLUMN_INFO_TYPE]]]}
             @columns = cols.map{|c| c.first}
             stmt.each do |r|

data/lib/sequel/adapters/db2.rb

@@ -38,7 +38,7 @@ module Sequel
       set_adapter_scheme :db2
 
       TEMPORARY = 'GLOBAL TEMPORARY '.freeze
-      rc, NullHandle = DB2CLI.SQLAllocHandle(DB2CLI::SQL_HANDLE_ENV, DB2CLI::SQL_NULL_HANDLE)
+      _, NullHandle = DB2CLI.SQLAllocHandle(DB2CLI::SQL_HANDLE_ENV, DB2CLI::SQL_NULL_HANDLE)
       
       # Hash of connection procs for converting
       attr_reader :conversion_procs
@@ -64,7 +64,7 @@ module Sequel
           log_connection_execute(conn, sql)
           sql = "SELECT IDENTITY_VAL_LOCAL() FROM SYSIBM.SYSDUMMY1"
           log_connection_execute(conn, sql) do |sth|
-            name, buflen, datatype, size, digits, nullable = checked_error("Could not describe column"){DB2CLI.SQLDescribeCol(sth, 1, 256)}
+            _, _, datatype, size, _, _ = checked_error("Could not describe column"){DB2CLI.SQLDescribeCol(sth, 1, 256)}
             if DB2CLI.SQLFetch(sth) != DB2CLI::SQL_NO_DATA_FOUND
               v, _ = checked_error("Could not get data"){DB2CLI.SQLGetData(sth, 1, datatype, size)}
               if v.is_a?(String) 
@@ -180,7 +180,6 @@ module Sequel
       def fetch_rows(sql)
         execute(sql) do |sth|
           db = @db
-          i = 1
           column_info = get_column_info(sth)
           cols = column_info.map{|c| c.at(1)}
           @columns = cols
@@ -213,7 +212,7 @@ module Sequel
         cps = db.conversion_procs
 
         (1..column_count).map do |i| 
-          name, buflen, datatype, size, digits, nullable = db.checked_error("Could not describe column"){DB2CLI.SQLDescribeCol(sth, i, MAX_COL_SIZE)}
+          name, _, datatype, size, digits, _ = db.checked_error("Could not describe column"){DB2CLI.SQLDescribeCol(sth, i, MAX_COL_SIZE)}
           pr = if datatype == DB2CLI::SQL_SMALLINT && convert && size <= 5 && digits <= 1
             cps[:boolean]
           elsif datatype == DB2CLI::SQL_CLOB && Sequel::DB2.use_clob_as_blob

data/lib/sequel/adapters/jdbc.rb

@@ -595,7 +595,6 @@ module Sequel
       # Parse the table schema for the given table.
       def schema_parse_table(table, opts=OPTS)
         m = output_identifier_meth(opts[:dataset])
-        ds = dataset
         schema, table = metadata_schema_and_table(table, opts)
         pks, ts = [], []
         metadata(:getPrimaryKeys, nil, schema, table) do |h|
@@ -781,8 +780,8 @@ module Sequel
 
         while result.next
           row = {}
-          cols.each do |n, i, pr|
-            row[n] = pr.call(result, i)
+          cols.each do |n, j, pr|
+            row[n] = pr.call(result, j)
           end
           yield row
         end

data/lib/sequel/adapters/jdbc/mysql.rb

@@ -54,8 +54,8 @@ module Sequel
               rs.close
             end
           else
-            statement(conn) do |stmt|
-              rs = stmt.executeQuery(LAST_INSERT_ID)
+            statement(conn) do |st|
+              rs = st.executeQuery(LAST_INSERT_ID)
               rs.next
               rs.getInt(1)
             end

data/lib/sequel/adapters/mysql.rb

@@ -133,12 +133,12 @@ module Sequel
       # depending on the value given.
       def convert_invalid_date_time=(v)
         m0 = ::Sequel.method(:string_to_time)
-        @conversion_procs[11] = (v != false) ?  lambda{|v| convert_date_time(v, &m0)} : m0
+        @conversion_procs[11] = (v != false) ?  lambda{|val| convert_date_time(val, &m0)} : m0
         m1 = ::Sequel.method(:string_to_date) 
-        m = (v != false) ? lambda{|v| convert_date_time(v, &m1)} : m1
+        m = (v != false) ? lambda{|val| convert_date_time(val, &m1)} : m1
         [10, 14].each{|i| @conversion_procs[i] = m}
         m2 = method(:to_application_timestamp)
-        m = (v != false) ? lambda{|v| convert_date_time(v, &m2)} : m2
+        m = (v != false) ? lambda{|val| convert_date_time(val, &m2)} : m2
         [7, 12].each{|i| @conversion_procs[i] = m}
         @convert_invalid_date_time = v
       end

data/lib/sequel/adapters/odbc.rb

@@ -100,7 +100,7 @@ module Sequel
           if rows = s.fetch_all
             rows.each do |row|
               hash = {}
-              cols.each{|n,i| hash[n] = convert_odbc_value(row[i])}
+              cols.each{|n,j| hash[n] = convert_odbc_value(row[j])}
               yield hash
             end
           end

data/lib/sequel/adapters/oracle.rb

@@ -111,7 +111,6 @@ module Sequel
         'decimal'.freeze=>Float, 'date'.freeze=>Time, 'datetime'.freeze=>Time,
         'time'.freeze=>Time, 'boolean'.freeze=>String, 'blob'.freeze=>OCI8::BLOB}
       def cursor_bind_params(conn, cursor, args)
-        cursor
         i = 0
         args.map do |arg, type|
           i += 1

data/lib/sequel/adapters/postgres.rb

@@ -108,7 +108,14 @@ module Sequel
     # PGconn subclass for connection specific methods used with the
     # pg, postgres, or postgres-pr driver.
     class Adapter < ::PGconn
-      DISCONNECT_ERROR_RE = /\A(?:could not receive data from server|no connection to the server|connection not open|terminating connection due to administrator command)/
+      disconnect_errors = [
+        'could not receive data from server',
+        'no connection to the server',
+        'connection not open',
+        'terminating connection due to administrator command',
+        'PQconsumeInput() SSL SYSCALL error'
+       ]
+      DISCONNECT_ERROR_RE = /\A#{Regexp.union(disconnect_errors)}/
       
       self.translate_results = false if respond_to?(:translate_results=)
       

data/lib/sequel/adapters/shared/mssql.rb

@@ -144,7 +144,7 @@ module Sequel
                   :rc__name___referenced_column, 
                   object_schema_name(:fk__referenced_object_id).as(:schema), 
                   object_name(:fk__referenced_object_id).as(:table)]}.
-          order(:name, :fkc__constraint_column_id)
+          order(:fk__name, :fkc__constraint_column_id)
         h = {}
         ds.each do |row|
           if r = h[row[:name]]

data/lib/sequel/adapters/shared/mysql.rb

@@ -464,7 +464,6 @@ module Sequel
           row[:allow_null] = row.delete(:Null) == 'YES'
           row[:default] = row.delete(:Default)
           row[:primary_key] = row.delete(:Key) == 'PRI'
-          row[:default] = nil if blank_object?(row[:default])
           row[:db_type] = row.delete(:Type)
           row[:type] = schema_column_type(row[:db_type])
           [m.call(row.delete(:Field)), row]

data/lib/sequel/adapters/shared/postgres.rb

@@ -906,6 +906,11 @@ module Sequel
         "DROP TRIGGER#{' IF EXISTS' if opts[:if_exists]} #{name} ON #{quote_schema_table(table)}#{' CASCADE' if opts[:cascade]}"
       end
 
+      # Support :foreign tables
+      def drop_table_sql(name, options)
+        "DROP#{' FOREIGN' if options[:foreign]} TABLE#{' IF EXISTS' if options[:if_exists]} #{quote_schema_table(name)}#{' CASCADE' if options[:cascade]}"
+      end
+
       # SQL for dropping a view from the database.
       def drop_view_sql(name, opts=OPTS)
         "DROP #{'MATERIALIZED ' if opts[:materialized]}VIEW#{' IF EXISTS' if opts[:if_exists]} #{quote_schema_table(name)}#{' CASCADE' if opts[:cascade]}"

data/lib/sequel/database/schema_methods.rb

@@ -142,7 +142,7 @@ module Sequel
     
     # Creates the join table unless it already exists.
     def create_join_table?(hash, options=OPTS)
-      if supports_create_table_if_not_exists?
+      if supports_create_table_if_not_exists? && options[:no_index]
         create_join_table(hash, options.merge(:if_not_exists=>true))
       elsif !table_exists?(join_table_name(hash, options))
         create_join_table(hash, options)
@@ -215,10 +215,12 @@ module Sequel
     #   # SELECT NULL FROM a LIMIT 1 -- check existence
     #   # CREATE TABLE a (a integer) -- if it doesn't already exist
     def create_table?(name, options=OPTS, &block)
-      if supports_create_table_if_not_exists?
-        create_table(name, options.merge(:if_not_exists=>true), &block)
+      options = options.dup
+      generator = options[:generator] ||= create_table_generator(&block)
+      if generator.indexes.empty? && supports_create_table_if_not_exists?
+        create_table(name, options.merge!(:if_not_exists=>true))
       elsif !table_exists?(name)
-        create_table(name, options, &block)
+        create_table(name, options)
       end
     end
 

data/lib/sequel/dataset/query.rb

@@ -82,16 +82,18 @@ module Sequel
       c
     end
 
-    # Returns a copy of the dataset with the SQL DISTINCT clause.
-    # The DISTINCT clause is used to remove duplicate rows from the
-    # output.  If arguments are provided, uses a DISTINCT ON clause,
-    # in which case it will only be distinct on those columns, instead
-    # of all returned columns.  Raises an error if arguments
-    # are given and DISTINCT ON is not supported.
+    # Returns a copy of the dataset with the SQL DISTINCT clause. The DISTINCT
+    # clause is used to remove duplicate rows from the output.  If arguments
+    # are provided, uses a DISTINCT ON clause, in which case it will only be
+    # distinct on those columns, instead of all returned columns. If a block
+    # is given, it is treated as a virtual row block, similar to +where+.
+    # Raises an error if arguments are given and DISTINCT ON is not supported.
     #
     #  DB[:items].distinct # SQL: SELECT DISTINCT * FROM items
     #  DB[:items].order(:id).distinct(:id) # SQL: SELECT DISTINCT ON (id) * FROM items ORDER BY id
-    def distinct(*args)
+    #  DB[:items].order(:id).distinct{func(:id)} # SQL: SELECT DISTINCT ON (func(id)) * FROM items ORDER BY id
+    def distinct(*args, &block)
+      virtual_row_columns(args, block)
       raise(InvalidOperation, "DISTINCT ON not supported") if !args.empty? && !supports_distinct_on?
       clone(:distinct => args)
     end

data/lib/sequel/extensions/migration.rb

@@ -203,12 +203,12 @@ module Sequel
       @actions << [:drop_join_table, *args]
     end
 
-    def create_table(*args)
-      @actions << [:drop_table, args.first]
+    def create_table(name, opts=OPTS)
+      @actions << [:drop_table, name, opts]
     end
 
-    def create_view(name, _, options={})
-      @actions << [:drop_view, name, options]
+    def create_view(name, _, opts=OPTS)
+      @actions << [:drop_view, name, opts]
     end
 
     def rename_column(table, name, new_name)

data/lib/sequel/model/associations.rb

@@ -259,7 +259,7 @@ module Sequel
             ds.send(:post_load, objects)
           else
             loader = placeholder_eager_loader
-            loader = loader.with_dataset{|ds| ds.eager(cascade)} if cascade
+            loader = loader.with_dataset{|dataset| dataset.eager(cascade)} if cascade
             objects = loader.all(eo[:id_map].keys)
           end
 
@@ -2036,6 +2036,12 @@ module Sequel
           end
           ds
         end
+
+        # If not caching associations, reload the database schema by default,
+        # ignoring any cached values.
+        def reload_db_schema?
+          !@cache_associations
+        end
       end
 
       # Instance methods used to implement the associations support.

data/lib/sequel/model/base.rb

@@ -580,14 +580,15 @@ module Sequel
       #   Artist.primary_key_hash(1) # => {:id=>1}
       #   Artist.primary_key_hash([1, 2]) # => {:id1=>1, :id2=>2}
       def primary_key_hash(value)
-        raise(Error, "#{self} does not have a primary key") unless key = @primary_key
-        case key
+        case key = @primary_key
+        when Symbol
+          {key => value}
         when Array
           hash = {}
-          key.each_with_index{|k,i| hash[k] = value[i]}
+          key.zip(Array(value)){|k,v| hash[k] = v}
           hash
         else
-          {key => value}
+          raise(Error, "#{self} does not have a primary key")
         end
       end
 
@@ -599,9 +600,16 @@ module Sequel
       #   Artist.filter(Artist.qualified_primary_key_hash(1))
       #   # SELECT * FROM artists WHERE (artists.id = 1)
       def qualified_primary_key_hash(value, qualifier=table_name)
-        h = primary_key_hash(value)
-        h.to_a.each{|k,v| h[SQL::QualifiedIdentifier.new(qualifier, k)] = h.delete(k)}
-        h
+        case key = @primary_key
+        when Symbol
+          {SQL::QualifiedIdentifier.new(qualifier, key) => value}
+        when Array
+          hash = {}
+          key.zip(Array(value)){|k,v| hash[SQL::QualifiedIdentifier.new(qualifier, k)] = v}
+          hash
+        else
+          raise(Error, "#{self} does not have a primary key")
+        end
       end
   
       # Similar to finder, but uses a prepared statement instead of a placeholder
@@ -891,7 +899,7 @@ module Sequel
       # Get the schema from the database, fall back on checking the columns
       # via the database if that will return inaccurate results or if
       # it raises an error.
-      def get_db_schema(reload = false)
+      def get_db_schema(reload = reload_db_schema?)
         set_columns(nil)
         return nil unless @dataset
         schema_hash = {}
@@ -933,7 +941,7 @@ module Sequel
         end
         schema_hash
       end
-      
+
       # Uncached version of setter_methods, to be overridden by plugins
       # that want to modify the methods used.
       def get_setter_methods
@@ -1045,6 +1053,11 @@ module Sequel
         end
       end
 
+      # Whether to reload the database schema by default, ignoring any cached value.
+      def reload_db_schema?
+        false
+      end
+      
       # Reset the cached fast primary lookup SQL if a simple table and primary key
       # are used, or set it to nil if not used.
       def reset_fast_pk_lookup_sql
@@ -1445,6 +1458,16 @@ module Sequel
         model.primary_key_hash(pk)
       end
       
+      # Returns a hash mapping the receivers primary key column(s) to their values.
+      # 
+      #   Artist[1].qualified_pk_hash
+      #   # => {Sequel.qualify(:artists, :id)=>1}
+      #   Artist[[1, 2]].qualified_pk_hash
+      #   # => {Sequel.qualify(:artists, :id1)=>1, Sequel.qualify(:artists, :id2)=>2}
+      def qualified_pk_hash(qualifier=model.table_name)
+        model.qualified_primary_key_hash(pk, qualifier)
+      end
+      
       # Reloads attributes from database and returns self. Also clears all
       # changed_columns information.  Raises an +Error+ if the record no longer
       # exists in the database.
@@ -1631,7 +1654,7 @@ module Sequel
         raise Error, "No dataset for model #{model}" unless ds = model.instance_dataset
 
         cond = if ds.joined_dataset?
-          model.qualified_primary_key_hash(pk)
+          qualified_pk_hash
         else
           pk_hash
         end
@@ -2283,11 +2306,12 @@ module Sequel
       # value.  If no records matches, returns nil.
       #
       #   # Single primary key
-      #   Artist.dataset.with_pk(1) # SELECT * FROM artists WHERE (id = 1) LIMIT 1
+      #   Artist.dataset.with_pk(1)
+      #   # SELECT * FROM artists WHERE (artists.id = 1) LIMIT 1
       #
       #   # Composite primary key
-      #   Artist.dataset.with_pk([1, 2]) # SELECT * FROM artists
-      #                                  # WHERE ((id1 = 1) AND (id2 = 2)) LIMIT 1
+      #   Artist.dataset.with_pk([1, 2])
+      #   # SELECT * FROM artists WHERE ((artists.id1 = 1) AND (artists.id2 = 2)) LIMIT 1
       def with_pk(pk)
         first(model.qualified_primary_key_hash(pk))
       end

data/lib/sequel/plugins/lazy_attributes.rb

@@ -83,7 +83,7 @@ module Sequel
           end
 
           if base_ds = opts[:dataset]
-            ds = base_ds.where(model.qualified_primary_key_hash(pk, table))
+            ds = base_ds.where(qualified_pk_hash(table))
           else
             base_ds = model.dataset
             ds = this

data/lib/sequel/plugins/validation_helpers.rb

@@ -241,7 +241,10 @@ module Sequel
               ds.where(arr.zip(vals))
             end
             ds = yield(ds) if block_given?
-            ds = ds.exclude(pk_hash) unless new?
+            unless new?
+              h = ds.joined_dataset? ? qualified_pk_hash : pk_hash
+              ds = ds.exclude(h)
+            end
             errors.add(a, message) unless ds.count == 0
           end
         end

data/lib/sequel/version.rb

@@ -3,7 +3,7 @@ module Sequel
   MAJOR = 4
   # The minor version of Sequel.  Bumped for every non-patch level
   # release, generally around once a month.
-  MINOR = 15
+  MINOR = 16
   # The tiny version of Sequel.  Usually 0, only bumped for bugfix
   # releases that fix regressions from previous versions.
   TINY  = 0

data/spec/adapters/postgres_spec.rb

@@ -277,10 +277,11 @@ describe "A PostgreSQL database" do
     a.should == "WARNING:  foo\n"
   end if DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG && DB.server_version >= 90000
 
-  specify "should support creating foreign tables" do
-    # This only tests the SQL created, because a true test using file_fdw or postgres_fdw
-    # requires superuser permissions, and you should not be running the tests as a superuser.
+  # These only test the SQL created, because a true test using file_fdw or postgres_fdw
+  # requires superuser permissions, and you should not be running the tests as a superuser.
+  specify "should support creating and dropping foreign tables" do
     DB.send(:create_table_sql, :t, DB.create_table_generator{Integer :a}, :foreign=>:f, :options=>{:o=>1}).should == 'CREATE FOREIGN TABLE "t" ("a" integer) SERVER "f" OPTIONS (o \'1\')'
+    DB.send(:drop_table_sql, :t, :foreign=>true).should == 'DROP FOREIGN TABLE "t"'
   end
 end
 

data/spec/core/dataset_spec.rb

@@ -1820,6 +1820,11 @@ describe "Dataset#distinct" do
     @dataset.distinct(Sequel.cast(:stamp, :integer), :node_id=>nil).sql.should == 'SELECT DISTINCT ON (CAST(stamp AS integer), (node_id IS NULL)) name FROM test'
   end
 
+  specify "should use DISTINCT ON if columns are given in a virtual row block and DISTINCT ON is supported" do
+    meta_def(@dataset, :supports_distinct_on?){true}
+    @dataset.distinct{func(:id)}.sql.should == 'SELECT DISTINCT ON (func(id)) name FROM test'
+  end
+
   specify "should do a subselect for count" do
     @dataset.distinct.count
     @db.sqls.should == ['SELECT count(*) AS count FROM (SELECT DISTINCT name FROM test) AS t1 LIMIT 1']

data/spec/core/schema_spec.rb

@@ -731,6 +731,17 @@ describe "DB#create_table?" do
     @db.create_table?(:cats){|*a|}
     @db.sqls.should == ['CREATE TABLE IF NOT EXISTS cats ()']
   end
+  
+  specify "should not use IF NOT EXISTS if the indexes are created" do
+    meta_def(@db, :table_exists?){|a| false}
+    meta_def(@db, :supports_create_table_if_not_exists?){true}
+    @db.create_table?(:cats){|*a| Integer :a, :index=>true}
+    @db.sqls.should == ['CREATE TABLE cats (a integer)', 'CREATE INDEX cats_a_index ON cats (a)']
+
+    meta_def(@db, :table_exists?){|a| true}
+    @db.create_table?(:cats){|*a| Integer :a, :index=>true}
+    @db.sqls.should == []
+  end
 end
 
 describe "DB#create_join_table" do
@@ -798,10 +809,21 @@ describe "DB#create_join_table?" do
     @db.sqls.should == []
   end
 
-  specify "should use IF NOT EXISTS if the database supports it" do
+  specify "should not use IF NOT EXISTS" do
+    meta_def(@db, :table_exists?){|a| false}
     meta_def(@db, :supports_create_table_if_not_exists?){true}
     @db.create_join_table?(:cat_id=>:cats, :dog_id=>:dogs)
-    @db.sqls.should == ['CREATE TABLE IF NOT EXISTS cats_dogs (cat_id integer NOT NULL REFERENCES cats, dog_id integer NOT NULL REFERENCES dogs, PRIMARY KEY (cat_id, dog_id))', 'CREATE INDEX cats_dogs_dog_id_cat_id_index ON cats_dogs (dog_id, cat_id)']
+    @db.sqls.should == ['CREATE TABLE cats_dogs (cat_id integer NOT NULL REFERENCES cats, dog_id integer NOT NULL REFERENCES dogs, PRIMARY KEY (cat_id, dog_id))', 'CREATE INDEX cats_dogs_dog_id_cat_id_index ON cats_dogs (dog_id, cat_id)']
+
+    meta_def(@db, :table_exists?){|a| true}
+    @db.create_join_table?(:cat_id=>:cats, :dog_id=>:dogs)
+    @db.sqls.should == []
+  end
+
+  specify "should not use IF NOT EXISTS if no_index is used" do
+    meta_def(@db, :supports_create_table_if_not_exists?){true}
+    @db.create_join_table?({:cat_id=>:cats, :dog_id=>:dogs}, :no_index=>true)
+    @db.sqls.should == ['CREATE TABLE IF NOT EXISTS cats_dogs (cat_id integer NOT NULL REFERENCES cats, dog_id integer NOT NULL REFERENCES dogs, PRIMARY KEY (cat_id, dog_id))']
   end
 end
   

data/spec/extensions/migration_spec.rb

@@ -121,7 +121,7 @@ describe "Reversible Migrations with Sequel.migration{change{}}" do
     end
     @db = @c.new
     @p = Proc.new do
-      create_table(:a){Integer :a}
+      create_table(:a, :foo=>:bar){Integer :a}
       add_column :a, :b, String
       add_index :a, :b
       rename_column :a, :b, :c
@@ -146,7 +146,7 @@ describe "Reversible Migrations with Sequel.migration{change{}}" do
   specify "should apply up with normal actions in normal order" do
     p = @p
     Sequel.migration{change(&p)}.apply(@db, :up)
-    @db.actions.should == [[:create_table, :a],
+    @db.actions.should == [[:create_table, :a, {:foo=>:bar}],
       [:add_column, :a, :b, String],
       [:add_index, :a, :b],
       [:rename_column, :a, :b, :c],
@@ -189,7 +189,7 @@ describe "Reversible Migrations with Sequel.migration{change{}}" do
       [:rename_column, :a, :c, :b],
       [:drop_index, :a, :b],
       [:drop_column, :a, :b],
-      [:drop_table, :a]]
+      [:drop_table, :a, {:foo=>:bar}]]
   end
   
   specify "should raise in the down direction if migration uses unsupported method" do

data/spec/extensions/validation_helpers_spec.rb

@@ -477,6 +477,20 @@ describe "Sequel::Plugins::ValidationHelpers" do
                     "SELECT count(*) AS count FROM items WHERE ((a IN (1, 2, 3)) AND (username = '0records') AND (id != 3)) LIMIT 1"]
   end
 
+  it "should use qualified primary keys for validates_unique when the dataset is joined" do
+    @c.columns(:id, :username, :password)
+    @c.set_dataset DB[:items]
+    c = @c
+    @c.set_validations{validates_unique(:username, :dataset=>c.cross_join(:a))}
+    @c.dataset._fetch = {:v=>0}
+    
+    DB.reset
+    @c.new(:username => "0records", :password => "anothertest").should be_valid
+    @c.load(:id=>3, :username => "0records", :password => "anothertest").should be_valid
+    DB.sqls.should == ["SELECT count(*) AS count FROM items CROSS JOIN a WHERE (username = '0records') LIMIT 1",
+                    "SELECT count(*) AS count FROM items CROSS JOIN a WHERE ((username = '0records') AND (items.id != 3)) LIMIT 1"]
+  end
+
   it "should support :only_if_modified option for validates_unique, and not check uniqueness for existing records if values haven't changed" do
     @c.columns(:id, :username, :password)
     @c.set_dataset DB[:items]

data/spec/model/association_reflection_spec.rb

@@ -479,22 +479,38 @@ end
 
 describe Sequel::Model::Associations::AssociationReflection, "with caching disabled" do
   before do
-    @c = Class.new(Sequel::Model(:foo))
-  end
-  after do
-    Object.send(:remove_const, :ParParent)
+    @db = Sequel.mock
+    @c = Class.new(Sequel::Model)
+    @c.dataset = @db[:foo]
+    @c.cache_associations = false
   end
 
   it "should not cache metadata" do
-    class ::ParParent < Sequel::Model; end
-    c = ParParent
-    @c.cache_associations = false
-    @c.many_to_one :c, :class=>:ParParent
-    @c.association_reflection(:c).associated_class.should == c
-    Object.send(:remove_const, :ParParent)
-    class ::ParParent < Sequel::Model; end
-    c = ParParent
-    @c.association_reflection(:c).associated_class.should == c
+    begin
+      class ::ParParent < Sequel::Model; end
+      c = ParParent
+      @c.many_to_one :c, :class=>:ParParent
+      @c.association_reflection(:c).associated_class.should == c
+      Object.send(:remove_const, :ParParent)
+      class ::ParParent < Sequel::Model; end
+      c = ParParent
+      @c.association_reflection(:c).associated_class.should == c
+    ensure
+      Object.send(:remove_const, :ParParent)
+    end
+  end
+
+  it "should not used cached schema" do
+    def @db.supports_schema_parsing?; true end
+    def @db.schema(table, opts={})
+      [[opts[:reload] ? :reload : :id, {}]]
+    end
+    @c.dataset = @db[:items]
+    @c.columns.should == [:reload]
+
+    @c.cache_associations = true
+    @c.dataset = @db[:items]
+    @c.columns.should == [:id]
   end
 end
 

data/spec/model/record_spec.rb

@@ -873,11 +873,50 @@ describe "Model#pk_hash" do
   it "should raise if no primary key" do
     @m.set_primary_key nil
     m = @m.new(:id => 111, :x => 2, :y => 3)
-    proc {m.pk_hash}.should raise_error(Sequel::Error)
+    proc{m.pk_hash}.should raise_error(Sequel::Error)
 
     @m.no_primary_key
     m = @m.new(:id => 111, :x => 2, :y => 3)
-    proc {m.pk_hash}.should raise_error(Sequel::Error)
+    proc{m.pk_hash}.should raise_error(Sequel::Error)
+  end
+end
+
+describe "Model#qualified_pk_hash" do
+  before do
+    @m = Class.new(Sequel::Model(:items))
+    @m.columns :id, :x, :y
+  end
+  
+  it "should by default return a hash with the value of the :id column" do
+    m = @m.load(:id => 111, :x => 2, :y => 3)
+    m.qualified_pk_hash.should == {Sequel.qualify(:items, :id) => 111}
+  end
+
+  it "should accept a custom qualifier" do
+    m = @m.load(:id => 111, :x => 2, :y => 3)
+    m.qualified_pk_hash(:foo).should == {Sequel.qualify(:foo, :id) => 111}
+  end
+
+  it "should return a hash with the primary key value for custom primary key" do
+    @m.set_primary_key :x
+    m = @m.load(:id => 111, :x => 2, :y => 3)
+    m.qualified_pk_hash.should == {Sequel.qualify(:items, :x) => 2}
+  end
+
+  it "should return a hash with the primary key values for composite primary key" do
+    @m.set_primary_key [:y, :x]
+    m = @m.load(:id => 111, :x => 2, :y => 3)
+    m.qualified_pk_hash.should == {Sequel.qualify(:items, :y) => 3, Sequel.qualify(:items, :x) => 2}
+  end
+
+  it "should raise if no primary key" do
+    @m.set_primary_key nil
+    m = @m.new(:id => 111, :x => 2, :y => 3)
+    proc{m.qualified_pk_hash}.should raise_error(Sequel::Error)
+
+    @m.no_primary_key
+    m = @m.new(:id => 111, :x => 2, :y => 3)
+    proc{m.qualified_pk_hash}.should raise_error(Sequel::Error)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 4.15.0
+  version: 4.16.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-11-01 00:00:00.000000000 Z
 dependencies: []
 description: The Database Toolkit for Ruby
 email: code@jeremyevans.net
@@ -132,6 +132,7 @@ extra_rdoc_files:
 - doc/release_notes/4.13.0.txt
 - doc/release_notes/4.14.0.txt
 - doc/release_notes/4.15.0.txt
+- doc/release_notes/4.16.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -234,6 +235,7 @@ files:
 - doc/release_notes/4.13.0.txt
 - doc/release_notes/4.14.0.txt
 - doc/release_notes/4.15.0.txt
+- doc/release_notes/4.16.0.txt
 - doc/release_notes/4.2.0.txt
 - doc/release_notes/4.3.0.txt
 - doc/release_notes/4.4.0.txt