sequel 4.12.0 → 4.13.0

data/spec/model/model_spec.rb

@@ -824,10 +824,10 @@ describe Sequel::Model, ".[]" do
     DB.sqls.should == ["SELECT * FROM items WHERE name = 'sharon'"]
   end
 
-  it "should return the first record for the given pk for a filtered dataset" do
-    @c.dataset = @c.dataset.filter(:active=>true)
+  it "should use a qualified primary key if the dataset is joined" do
+    @c.dataset = @c.dataset.cross_join(:a)
     @c[1].should == @c.load(:name => 'sharon', :id => 1)
-    DB.sqls.should == ["SELECT * FROM items WHERE ((active IS TRUE) AND (id = 1)) LIMIT 1"]
+    DB.sqls.should == ["SELECT * FROM items CROSS JOIN a WHERE (items.id = 1) LIMIT 1"]
   end
 
   it "should work correctly for composite primary key specified as array" do
@@ -905,6 +905,16 @@ describe "Model.db_schema" do
     @c.primary_key.should == :x
   end
   
+  specify "should automatically set a singular primary key even if there are specific columns selected" do
+    ds = @dataset.select(:a, :b, :x)
+    d = ds.db
+    def d.schema(table, *opts) [[:a, {:primary_key=>false}], [:b, {:primary_key=>false}], [:x, {:primary_key=>true}]] end
+    @c.primary_key.should == :id
+    @c.dataset = ds
+    @c.db_schema.should == {:a=>{:primary_key=>false}, :b=>{:primary_key=>false}, :x=>{:primary_key=>true}}
+    @c.primary_key.should == :x
+  end
+  
   specify "should automatically set the composite primary key based on the schema" do
     ds = @dataset
     d = ds.db

data/spec/model/record_spec.rb

@@ -57,7 +57,7 @@ describe "Model#save" do
     ds._fetch = {:y=>2}
     def ds.supports_insert_select?() true end
     def ds.insert_select(hash)
-      execute("INSERT INTO items (y) VALUES (2) RETURNING *"){|r| return r}
+      with_sql_first("INSERT INTO items (y) VALUES (2) RETURNING *")
     end
     o = @c.new(:x => 1)
     o.save
@@ -72,6 +72,23 @@ describe "Model#save" do
     @c.new(:x => 1).save
   end
 
+  it "should use dataset's insert_select method if the dataset uses returning, even if specific columns are selected" do
+    def (@c.dataset).supports_returning?(_) true end
+    ds = @c.dataset = @c.dataset.select(:y).returning(:y)
+    DB.reset
+    ds = @c.instance_dataset
+    ds._fetch = {:y=>2}
+    def ds.supports_insert_select?() true end
+    def ds.insert_select(hash)
+      with_sql_first("INSERT INTO items (y) VALUES (2) RETURNING y")
+    end
+    o = @c.new(:x => 1)
+    o.save
+    
+    o.values.should == {:y=>2}
+    DB.sqls.should == ["INSERT INTO items (y) VALUES (2) RETURNING y"]
+  end
+
   it "should use value returned by insert as the primary key and refresh the object" do
     o = @c.new(:x => 11)
     o.save
@@ -783,6 +800,12 @@ describe Sequel::Model, "#this" do
     instance.this.sql.should == "SELECT * FROM examples WHERE (a = 3) LIMIT 1"
   end
 
+  it "should use a qualified primary key if the dataset is joined" do
+    @example.dataset = @example.dataset.cross_join(:a)
+    instance = @example.load(:id => 3)
+    instance.this.sql.should == "SELECT * FROM examples CROSS JOIN a WHERE (examples.id = 3) LIMIT 1"
+  end
+
   it "should support composite primary keys" do
     @example.set_primary_key [:x, :y]
     instance = @example.load(:x => 4, :y => 5)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 4.12.0
+  version: 4.13.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies: []
 description: The Database Toolkit for Ruby
 email: code@jeremyevans.net
@@ -129,6 +129,7 @@ extra_rdoc_files:
 - doc/release_notes/4.10.0.txt
 - doc/release_notes/4.11.0.txt
 - doc/release_notes/4.12.0.txt
+- doc/release_notes/4.13.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -228,6 +229,7 @@ files:
 - doc/release_notes/4.10.0.txt
 - doc/release_notes/4.11.0.txt
 - doc/release_notes/4.12.0.txt
+- doc/release_notes/4.13.0.txt
 - doc/release_notes/4.2.0.txt
 - doc/release_notes/4.3.0.txt
 - doc/release_notes/4.4.0.txt
@@ -256,7 +258,7 @@ files:
 - lib/sequel/adapters/do.rb
 - lib/sequel/adapters/do/mysql.rb
 - lib/sequel/adapters/do/postgres.rb
-- lib/sequel/adapters/do/sqlite.rb
+- lib/sequel/adapters/do/sqlite3.rb
 - lib/sequel/adapters/firebird.rb
 - lib/sequel/adapters/ibmdb.rb
 - lib/sequel/adapters/informix.rb
@@ -265,16 +267,16 @@ files:
 - lib/sequel/adapters/jdbc/cubrid.rb
 - lib/sequel/adapters/jdbc/db2.rb
 - lib/sequel/adapters/jdbc/derby.rb
-- lib/sequel/adapters/jdbc/firebird.rb
+- lib/sequel/adapters/jdbc/firebirdsql.rb
 - lib/sequel/adapters/jdbc/h2.rb
 - lib/sequel/adapters/jdbc/hsqldb.rb
-- lib/sequel/adapters/jdbc/informix.rb
+- lib/sequel/adapters/jdbc/informix-sqli.rb
+- lib/sequel/adapters/jdbc/jdbcprogress.rb
 - lib/sequel/adapters/jdbc/jtds.rb
 - lib/sequel/adapters/jdbc/mssql.rb
 - lib/sequel/adapters/jdbc/mysql.rb
 - lib/sequel/adapters/jdbc/oracle.rb
 - lib/sequel/adapters/jdbc/postgresql.rb
-- lib/sequel/adapters/jdbc/progress.rb
 - lib/sequel/adapters/jdbc/sqlanywhere.rb
 - lib/sequel/adapters/jdbc/sqlite.rb
 - lib/sequel/adapters/jdbc/sqlserver.rb
@@ -283,7 +285,9 @@ files:
 - lib/sequel/adapters/mysql.rb
 - lib/sequel/adapters/mysql2.rb
 - lib/sequel/adapters/odbc.rb
+- lib/sequel/adapters/odbc/db2.rb
 - lib/sequel/adapters/odbc/mssql.rb
+- lib/sequel/adapters/odbc/progress.rb
 - lib/sequel/adapters/openbase.rb
 - lib/sequel/adapters/oracle.rb
 - lib/sequel/adapters/postgres.rb
@@ -352,6 +356,7 @@ files:
 - lib/sequel/extensions/core_extensions.rb
 - lib/sequel/extensions/core_refinements.rb
 - lib/sequel/extensions/current_datetime_timestamp.rb
+- lib/sequel/extensions/dataset_source_alias.rb
 - lib/sequel/extensions/date_arithmetic.rb
 - lib/sequel/extensions/empty_array_ignore_nulls.rb
 - lib/sequel/extensions/error_sql.rb
@@ -370,6 +375,7 @@ files:
 - lib/sequel/extensions/pagination.rb
 - lib/sequel/extensions/pg_array.rb
 - lib/sequel/extensions/pg_array_ops.rb
+- lib/sequel/extensions/pg_enum.rb
 - lib/sequel/extensions/pg_hstore.rb
 - lib/sequel/extensions/pg_hstore_ops.rb
 - lib/sequel/extensions/pg_inet.rb
@@ -385,6 +391,7 @@ files:
 - lib/sequel/extensions/pretty_table.rb
 - lib/sequel/extensions/query.rb
 - lib/sequel/extensions/query_literals.rb
+- lib/sequel/extensions/round_timestamps.rb
 - lib/sequel/extensions/ruby18_symbol_extensions.rb
 - lib/sequel/extensions/schema_caching.rb
 - lib/sequel/extensions/schema_dumper.rb
@@ -418,6 +425,7 @@ files:
 - lib/sequel/plugins/boolean_readers.rb
 - lib/sequel/plugins/caching.rb
 - lib/sequel/plugins/class_table_inheritance.rb
+- lib/sequel/plugins/column_select.rb
 - lib/sequel/plugins/composition.rb
 - lib/sequel/plugins/constraint_validations.rb
 - lib/sequel/plugins/dataset_associations.rb
@@ -428,6 +436,7 @@ files:
 - lib/sequel/plugins/force_encoding.rb
 - lib/sequel/plugins/hook_class_methods.rb
 - lib/sequel/plugins/input_transformer.rb
+- lib/sequel/plugins/insert_returning_select.rb
 - lib/sequel/plugins/instance_filters.rb
 - lib/sequel/plugins/instance_hooks.rb
 - lib/sequel/plugins/json_serializer.rb
@@ -435,6 +444,7 @@ files:
 - lib/sequel/plugins/list.rb
 - lib/sequel/plugins/many_through_many.rb
 - lib/sequel/plugins/many_to_one_pk_lookup.rb
+- lib/sequel/plugins/modification_detection.rb
 - lib/sequel/plugins/mssql_optimistic_locking.rb
 - lib/sequel/plugins/nested_attributes.rb
 - lib/sequel/plugins/optimistic_locking.rb
@@ -507,6 +517,7 @@ files:
 - spec/extensions/boolean_readers_spec.rb
 - spec/extensions/caching_spec.rb
 - spec/extensions/class_table_inheritance_spec.rb
+- spec/extensions/column_select_spec.rb
 - spec/extensions/columns_introspection_spec.rb
 - spec/extensions/composition_spec.rb
 - spec/extensions/connection_validator_spec.rb
@@ -515,6 +526,7 @@ files:
 - spec/extensions/core_refinements_spec.rb
 - spec/extensions/current_datetime_timestamp_spec.rb
 - spec/extensions/dataset_associations_spec.rb
+- spec/extensions/dataset_source_alias_spec.rb
 - spec/extensions/date_arithmetic_spec.rb
 - spec/extensions/defaults_setter_spec.rb
 - spec/extensions/dirty_spec.rb
@@ -531,6 +543,7 @@ files:
 - spec/extensions/hook_class_methods_spec.rb
 - spec/extensions/inflector_spec.rb
 - spec/extensions/input_transformer_spec.rb
+- spec/extensions/insert_returning_select_spec.rb
 - spec/extensions/instance_filters_spec.rb
 - spec/extensions/instance_hooks_spec.rb
 - spec/extensions/json_serializer_spec.rb
@@ -540,6 +553,7 @@ files:
 - spec/extensions/many_through_many_spec.rb
 - spec/extensions/meta_def_spec.rb
 - spec/extensions/migration_spec.rb
+- spec/extensions/modification_detection_spec.rb
 - spec/extensions/mssql_optimistic_locking_spec.rb
 - spec/extensions/named_timezones_spec.rb
 - spec/extensions/nested_attributes_spec.rb
@@ -549,6 +563,7 @@ files:
 - spec/extensions/pg_array_associations_spec.rb
 - spec/extensions/pg_array_ops_spec.rb
 - spec/extensions/pg_array_spec.rb
+- spec/extensions/pg_enum_spec.rb
 - spec/extensions/pg_hstore_ops_spec.rb
 - spec/extensions/pg_hstore_spec.rb
 - spec/extensions/pg_inet_spec.rb
@@ -571,6 +586,7 @@ files:
 - spec/extensions/query_literals_spec.rb
 - spec/extensions/query_spec.rb
 - spec/extensions/rcte_tree_spec.rb
+- spec/extensions/round_timestamps_spec.rb
 - spec/extensions/schema_caching_spec.rb
 - spec/extensions/schema_dumper_spec.rb
 - spec/extensions/schema_spec.rb