sequel 4.3.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5cf40a4c3d9c93b6ed7fa958db814a768fbc322
-  data.tar.gz: 06fb6c46cdf9af739fe547de06aedb598b46b11e
+  metadata.gz: 7006f0a52cb0de63ef52daa4eee4f0246b4dff47
+  data.tar.gz: e936af319d149dcfdd4cffc7e183f79862e71d9f
 SHA512:
-  metadata.gz: 1d05bce34cc981ada0a4429d9cfbb861f8ad52b9fe83ae604f3ea0395f27deffe766e865d4a57e5ebd791df799215570f945b488fd6e7a317bd6b9f5d821e3bd
-  data.tar.gz: 7bd18b9518488d92f7b45024d93ae31b0b497580e681f65cbc1ee2f1a914f1c4f69a250fd1e4759ddcd37004a6ce4c4125f81cd61b11bf51428652bd7d97fefb
+  metadata.gz: f418f71c2c0bf871f80beb3948e03e5dfb531e7d14f612a78d9265cf7e7771781dd0cc0d23fe43c0539ff0b58512eeecac11c4a3c75aa93e887e9dd91fdbcc95
+  data.tar.gz: b33de96a8d47aa303998c9ee560a351574a92176ef80adf23d3c749ebdbdfaf0762861cf6d454c72a89705a7b5c7e167161229dd12d8857d97b1ea090f0fcdd9

data/CHANGELOG

@@ -1,3 +1,37 @@
+=== 4.4.0 (2013-11-01)
+
+* Make Database#tables not show tables in the recycle bin on Oracle (jeremyevans) (#728)
+
+* Don't automatically order on all columns when emulating offsets for unordered datasets on DB2 (jeremyevans)
+
+* Improve PostgreSQL type support in the jdbc/postgresql adapter (jeremyevans)
+
+* Make offset emulation on Oracle work when using columns that can't be ordered (jeremyevans, sdeming) (#724, #725)
+
+* Make filter by associations support handle associations with :conditions or block (jeremyevans)
+
+* Make association cloning handle :block correctly for clones of clones (jeremyevans)
+
+* Make association cloning handle :eager_block option correctly (jeremyevans)
+
+* Make add_primary_key work on h2 (jeremyevans)
+
+* Add support for foreign key parsing on Oracle (jeremyevans)
+
+* Add support for foreign key parsing to the jdbc adapter (jeremyevans)
+
+* Make add_foreign_key work on HSQLDB (jeremyevans)
+
+* Add table_select plugin for selecting table.* instead of * for model datasets (jeremyevans)
+
+* Issue constraint_validation table deletes before inserts, so modifying constraint via drop/add in same alter_table block works (jeremyevans)
+
+* Support add_*/remove_*/remove_all_* pg_array_to_many association methods on unsaved model objects (jeremyevans)
+
+* Add Sybase SQLAnywhere support via new sqlanywhere and jdbc/sqlanywhere adapters (gditrick, jeremyevans)
+
+* Add Dataset#offset for setting the offset separately from the limit (Paul Henry, jeremyevans) (#717)
+
 === 4.3.0 (2013-10-02)
 
 * Fix literalization of empty blobs on MySQL (jeremyevans) (#715)

data/README.rdoc

@@ -13,8 +13,8 @@ toolkit for Ruby.
   configurations, and database sharding.
 * Sequel currently has adapters for ADO, Amalgalite, CUBRID,
   DataObjects, DB2, DBI, Firebird, IBM_DB, Informix, JDBC, MySQL,
-  Mysql2, ODBC, OpenBase, Oracle, PostgreSQL, SQLite3, Swift, and
-  TinyTDS.
+  Mysql2, ODBC, OpenBase, Oracle, PostgreSQL, SQLAnywhere, SQLite3,
+  Swift, and TinyTDS.
 
 == Resources
 
@@ -70,7 +70,7 @@ Sequel includes an IRB console for quick access to databases (usually referred t
 
 You get an IRB session with the database object stored in DB.
 
-In addition to providing an IRB shell (the default behavior), bin/sequel also has support for migrating databases, dumping schema migrations, and copying databases.  See the {bin/sequel guide}[link:files/doc/bin_sequel_rdoc.html] for more details.
+In addition to providing an IRB shell (the default behavior), bin/sequel also has support for migrating databases, dumping schema migrations, and copying databases.  See the {bin/sequel guide}[rdoc-ref:doc/bin_sequel.rdoc] for more details.
 
 == An Introduction
 
@@ -250,12 +250,12 @@ After filtering, you can retrieve the matching records by using any of the retri
 
   my_posts.each{|row| p row}
   
-See the {Dataset Filtering}[link:files/doc/dataset_filtering_rdoc.html] file for more details.
+See the {Dataset Filtering}[rdoc-ref:doc/dataset_filtering.rdoc] file for more details.
 
 === Security
 
 Designing apps with security in mind is a best practice.
-Please read the {Security Guide}[link:files/doc/security_rdoc.html] for details on security
+Please read the {Security Guide}[rdoc-ref:doc/security.rdoc] for details on security
 issues that you should be aware of when using Sequel.
 
 === Summarizing Records
@@ -313,7 +313,7 @@ You can also specify descending order:
 
 === Core Extensions
 
-Note the use of <tt>Sequel.desc(:stamp)</tt> in the above example.  Much of Sequel's DSL uses this style, calling methods on the Sequel module that return SQL expression objects.  Sequel also ships with a {core_extensions extension}[link:files/doc/core_extensions_rdoc.html]) that integrates Sequel's DSL better into the ruby language, allowing you to write:
+Note the use of <tt>Sequel.desc(:stamp)</tt> in the above example.  Much of Sequel's DSL uses this style, calling methods on the Sequel module that return SQL expression objects.  Sequel also ships with a {core_extensions extension}[rdoc-ref:doc/core_extensions.rdoc]) that integrates Sequel's DSL better into the ruby language, allowing you to write:
 
   :stamp.desc
 
@@ -574,7 +574,7 @@ That will just change the value for the object, it will not update the row in th
 
 === Mass assignment
 
-You can also set the values for multiple columns in a single method call, using one of the mass-assignment methods.  See the {mass assignment guide}[link:files/doc/mass_assignment_rdoc.html] for details.  For example +set+ updates the model's column values without saving:
+You can also set the values for multiple columns in a single method call, using one of the mass-assignment methods.  See the {mass assignment guide}[rdoc-ref:doc/mass_assignment.rdoc] for details.  For example +set+ updates the model's column values without saving:
 
   post.set(:title=>'hey there', :updated_by=>'foo')
 

data/Rakefile

@@ -99,7 +99,7 @@ if rdoc_task_class
     rdoc_task_class.new(:website_rdoc_plugins) do |rdoc|
       rdoc.rdoc_dir = "www/public/rdoc-plugins"
       rdoc.options += RDOC_DEFAULT_OPTS + %w'--main Sequel --no-ignore-invalid'
-      rdoc.rdoc_files.add %w"lib/sequel/{extensions,plugins}/**/*.rb"
+      rdoc.rdoc_files.add %w"lib/sequel/{extensions,plugins}/**/*.rb doc/core_*"
     end
   
     desc "Update sequel.rubyforge.org"
@@ -170,7 +170,7 @@ begin
   spec_with_cov.call("spec_plugin", Dir["spec/extensions/*_spec.rb"].sort_by{rand}, "Run extension/plugin specs"){|t| t.rcov_opts.concat(%w'--exclude "lib/sequel/([a-z_]+\.rb|adapters|connection_pool|database|dataset|model)"')}
   spec_with_cov.call("spec_integration", Dir["spec/integration/*_test.rb"], "Run integration tests")
 
-  %w'postgres sqlite mysql informix oracle firebird mssql db2'.each do |adapter|
+  %w'postgres sqlite mysql informix oracle firebird mssql db2 sqlanywhere'.each do |adapter|
     spec_with_cov.call("spec_#{adapter}", ["spec/adapters/#{adapter}_spec.rb"] + Dir["spec/integration/*_test.rb"], "Run #{adapter} specs"){|t| t.rcov_opts.concat(%w'--exclude "lib/sequel/([a-z_]+\.rb|connection_pool|database|dataset|model|extensions|plugins)"')}
   end
 

data/doc/active_record.rdoc

@@ -332,7 +332,7 @@ With either way of eager loading, you must call +all+ to retrieve all records at
   
 Like ActiveRecord, Sequel supports cascading of eager loading for both methods of eager loading.
 
-Unlike ActiveRecord, Sequel allows you to eager load custom associations using the <tt>:eager_loader</tt> and <tt>:eager_grapher</tt> association options.  See the {Advanced Associations guide}[link:files/doc/advanced_associations_rdoc.html] for more details.
+Unlike ActiveRecord, Sequel allows you to eager load custom associations using the <tt>:eager_loader</tt> and <tt>:eager_grapher</tt> association options.  See the {Advanced Associations guide}[rdoc-ref:doc/advanced_associations.rdoc] for more details.
 
 Table aliasing when eager loading via +eager_graph+ is different in Sequel than ActiveRecord.  Sequel will always attempt to use the association name, not the table name, for any associations.  If the association name has already been used, Sequel will append _N to it, where N starts at 0 and increases by 1.  For example, for a self referential association:
 
@@ -581,7 +581,7 @@ Here's a mapping of ActiveRecord +find+ options to <tt>Sequel::Dataset</tt> meth
 :order :: order
 :group :: group
 :limit :: limit
-:offset :: limit # second entry in limit array
+:offset :: offset
 :joins :: join, left_join, etc. # many other join methods
 :include :: eager, eager_graph # eager does preloading, eager_graph does JOINs
 :select :: select

data/doc/association_basics.rdoc

@@ -445,7 +445,7 @@ use separate filter calls:
 
   Album.where(:tags=>@tag1).where(:tags=>@tag2)
 
-Or the the array form of condition specifiers:
+Or the array form of condition specifiers:
 
   Album.where([[:tags, @tag1], [:tags, @tag2]])
 
@@ -462,8 +462,22 @@ the other forms, this can be inverted:
  
 This will return all albums whose artist does not start with 'A'.
 
-Note that filtering by associations only works correctly for simple
-associations (ones without conditions).
+Filtering by associations even works for associations that have
+conditions added via the :conditions option or a block:
+
+  Album.one_to_many :popular_tags, :clone=>:tags do |ds|
+    ds.where{times_used > 1000}
+  end
+  Album.where(:popular_tags=>[@tag1, @tag2])
+
+This will return all albums that whose popular tags would include
+at least one of those tags.
+
+Note that filtering by associations does not work for associations
+that use blocks with instance-specific code, or associations that
+have a limit or offset. This includes many_to_one/one_to_one
+associations that would return multiple values if they were not
+limited to a single value.
 
 == Name Collisions
 
@@ -677,7 +691,7 @@ The add_<i>association</i> method returns the now associated object:
 
 === remove_<i>association</i>(object_to_disassociate) (e.g. remove_album) [+one_to_many+ and +many_to_many+]
 
-The remove_<i>association</i> method disassociates the the passed object from
+The remove_<i>association</i> method disassociates the passed object from
 the current object.  For +one_to_many+ associations, it sets the foreign key of
 the associated object to NULL, and saves the associated object.  For
 +many_to_many+ associations, this deletes the matching row in the join table.
@@ -735,7 +749,7 @@ added methods:
   ds.model_object # @artist
   ds.association_reflection # same as Artist.association_reflection(:albums)
 
-For a more info on Sequel's reflection capabilities see the {Reflection page}[link:files/doc/reflection_rdoc.html].
+For a more info on Sequel's reflection capabilities see the {Reflection page}[rdoc-ref:doc/reflection.rdoc].
 
 == Overriding Method Behavior
 
@@ -1041,7 +1055,7 @@ the artist can perform any one of four tasks for the lyric:
 
 A module or array of modules to extend the dataset with.  These are used to
 set up association extensions.  For more information , please see the
-{Advanced Associations page}[link:files/doc/advanced_associations_rdoc.html].
+{Advanced Associations page}[rdoc-ref:doc/advanced_associations.rdoc].
 
 ==== :primary_key
 
@@ -1235,7 +1249,7 @@ to eagerly load:
 
 A custom loader to use when eagerly load associated objects via eager.
 For many details and examples of custom eager loaders, please see the
-{Advanced Associations guide}[link:files/doc/advanced_associations_rdoc.html].
+{Advanced Associations guide}[rdoc-ref:doc/advanced_associations.rdoc].
 
 ==== :eager_loader_key
 

data/doc/bin_sequel.rdoc

@@ -24,7 +24,7 @@ In general, you probably want to provide a connection string argument to bin/seq
   sequel postgres://user:pass@host/database_name
   sequel mysql2://user:pass@host/database_name
 
-See the {Connecting to a database guide}[link:files/doc/opening_databases_rdoc.html] for more details about and examples of connection strings.
+See the {Connecting to a database guide}[rdoc-ref:doc/opening_databases.rdoc] for more details about and examples of connection strings.
 
 === YAML Connection File
 
@@ -77,7 +77,7 @@ You can use the -M attribute to set the version to migrate to:
 
   sequel -m /path/to/migrations/dir -M 3 postgres://host/database
 
-See the {migration guide}[link:files/doc/migration_rdoc.html] for more details about migrations.
+See the {migration guide}[rdoc-ref:doc/migration.rdoc] for more details about migrations.
 
 === Dump Schemas
 

data/doc/cheat_sheet.rdoc

@@ -63,7 +63,7 @@ Without a filename argument, the sqlite adapter will setup a new sqlite database
   dataset.inject(0){|sum, r| sum + r[:value]}
   dataset.sum(:value) # better
 
-== Filtering (see also {Dataset Filtering}[link:files/doc/dataset_filtering_rdoc.html])
+== Filtering (see also {Dataset Filtering}[rdoc-ref:doc/dataset_filtering.rdoc])
 
 === Equality
 
@@ -121,6 +121,7 @@ Without a filename argument, the sqlite adapter will setup a new sqlite database
 
   dataset.limit(30) # LIMIT 30
   dataset.limit(30, 10) # LIMIT 30 OFFSET 10
+  dataset.limit(30).offset(10) # LIMIT 30 OFFSET 10
 
 == Joins
 

data/doc/dataset_basics.rdoc

@@ -81,7 +81,7 @@ WHERE:: where, filter, exclude, exclude_where, and, or, grep, invert, unfiltered
 GROUP:: group, group_by, group_and_count, select_group, ungrouped
 HAVING:: having, exclude_having, invert, unfiltered
 ORDER:: order, order_by, order_append, order_prepend, order_more, reverse, reverse_order, unordered
-LIMIT:: limit, unlimited
+LIMIT/OFFSET:: limit, offset, unlimited
 compounds:: union, intersect, except
 locking:: for_update, lock_style
 common table expressions:: with, with_recursive

data/doc/dataset_filtering.rdoc

@@ -29,7 +29,7 @@ If you are specifying a filter/selection/order, you can use a virtual row block:
 
   items.select{avg(price)}
 
-You can also use the {core_extensions extension}[link:files/doc/core_extensions_rdoc.html] and the +sql_function+ method:
+You can also use the {core_extensions extension}[rdoc-ref:doc/core_extensions.rdoc] and the +sql_function+ method:
 
   :avg.sql_function(:price)
 

data/doc/migration.rdoc

@@ -26,7 +26,7 @@ you generally need to run Sequel's migrator with <tt>bin/sequel -m</tt>:
 Migrations in Sequel use a very simple DSL via the <tt>Sequel.migration</tt>
 method, and inside the DSL, use the <tt>Sequel::Database</tt> schema
 modification methods such as +create_table+ and +alter_table+.
-See the {schema modification guide}[link:files/doc/schema_modification_rdoc.html]
+See the {schema modification guide}[rdoc-ref:doc/schema_modification.rdoc]
 for details on the schema modification methods you can use.
 
 == A Basic Migration
@@ -144,7 +144,7 @@ Migrations themselves do not contain any schema modification methods, but they m
 any of the <tt>Sequel::Database</tt> modification methods, of which there are many.  The main
 ones are +create_table+ and +alter_table+, but Sequel also comes with numerous other schema
 modification methods, most of which are shortcuts for +alter_table+ (all of these methods are
-described in more detail in the {schema modification guide}[link:files/doc/schema_modification_rdoc.html]):
+described in more detail in the {schema modification guide}[rdoc-ref:doc/schema_modification.rdoc]):
 
 * add_column
 * add_index

data/doc/object_model.rdoc

@@ -204,7 +204,7 @@ If Sequel needs to represent an SQL concept that does not map directly to an exi
 ruby class, it will generally use a Sequel::SQL::Expression subclass to represent that
 concept.
 
-Some of the examples below show examples that require the {core_extensions extension}[link:files/doc/core_extensions_rdoc.html].
+Some of the examples below show examples that require the {core_extensions extension}[rdoc-ref:doc/core_extensions.rdoc].
 
 === Sequel::LiteralString
 
@@ -530,7 +530,7 @@ block expression support:
 In the above code, the block is instance-evaled inside a VirtualRow instance.
 
 These objects are usually not instantiated manually.  See the
-{Virtual Row Guide}[link:files/doc/virtual_rows_rdoc.html] for details.
+{Virtual Row Guide}[rdoc-ref:doc/virtual_rows.rdoc] for details.
 
 === Sequel::SQL::Window
 

data/doc/opening_databases.rdoc

@@ -76,7 +76,7 @@ These options are shared by all adapters unless otherwise noted.
 :test :: Whether to test that a valid database connection can be made (false by default)
 :user :: The user account name to use logging in
 
-The following options can be specified and are passed to the the database's internal connection pool.
+The following options can be specified and are passed to the database's internal connection pool.
 
 :after_connect :: A proc called after a new connection is made, with the connection object (default: nil)
 :max_connections :: The maximum size of the connection pool (default: 4 connections on most databases)
@@ -271,6 +271,7 @@ Example connection strings:
   jdbc:firebirdsql:localhost/3050:/path/to/database.fdb
   jdbc:jdbcprogress:T:hostname:port:database
   jdbc:cubrid:hostname:port:database:::
+  jdbc:sqlanywhere://localhost?DBN=Test;UID=user;PWD=password
 
 You can also use JNDI connection strings:
 
@@ -370,6 +371,17 @@ The following additional options are supported:
 :use_iso_date_format :: This can be set to false to not force the ISO date format.  Sequel forces
                         it by default to allow for an optimization.
 
+=== sqlanywhere
+
+The sqlanywhere driver works off connection strings, so a connection string
+is built based on the url/options hash provided.  The following additional
+options are respected:
+
+:commlinks :: specify the CommLinks connection string option
+:conn_string :: specify the connection string to use, ignoring all other options
+:connection_name :: specify the ConnectionName connection string option
+:encoding :: specify the CharSet connection string option
+
 === sqlite
 
 Requires: sqlite3

data/doc/querying.rdoc

@@ -11,7 +11,7 @@ aims to be a gentle introduction to Sequel's querying support.
 While you can easily use raw SQL with Sequel, a large part of the
 advantage you get from using Sequel is Sequel's ability to abstract
 SQL from you and give you a much nicer interface. Sequel also ships with
-a {core_extensions extension}[link:files/doc/core_extensions_rdoc.html],
+a {core_extensions extension}[rdoc-ref:doc/core_extensions.rdoc],
 which better integrates Sequel's DSL into the ruby language.
 
 == Retrieving Objects
@@ -25,7 +25,7 @@ method you can use.
 === Sequel::Dataset
 
 If you are new to Sequel and aren't familiar with Sequel, you should probably
-read the {"Dataset Basics" guide}[link:files/doc/dataset_basics_rdoc.html],
+read the {"Dataset Basics" guide}[rdoc-ref:doc/dataset_basics.rdoc],
 then come back here.
 
 === Retrieving a Single Object
@@ -380,7 +380,7 @@ If a block is passed to a filter, it is treated as a virtual row block:
   Artist.where{id > 5}
   # SELECT * FROM artists WHERE id > 5
 
-You can learn more about virtual row blocks in the {"Virtual Rows" guide}[link:files/doc/virtual_rows_rdoc.html].
+You can learn more about virtual row blocks in the {"Virtual Rows" guide}[rdoc-ref:doc/virtual_rows.rdoc].
 
 You can provide both regular arguments and a block, in which case the results
 will be ANDed together:
@@ -629,7 +629,12 @@ You can provide a second argument to +limit+ to specify an offset:
   Artist.limit(5, 10)
   # SELECT * FROM artists LIMIT 5 OFFSET 10
 
-This would return the 11th through 15th records in the original
+You can also call the +offset+ method separately:
+
+  Artist.limit(5).offset(10)
+  # SELECT * FROM artists LIMIT 5 OFFSET 10
+
+Either of these would return the 11th through 15th records in the original
 dataset.
 
 To remove a limit from a dataset, use +unlimited+:

data/doc/release_notes/4.4.0.txt

@@ -0,0 +1,92 @@
+= New Features
+
+* Sequel now supports Sybase SQLAnywhere, via the sqlanywhere and
+  jdbc/sqlanywhere adapters.
+
+* The filter by associations support now handles cases where the
+  association has :conditions or a block (as long as the block
+  does not rely on instance-specific behavior).  This allows
+  you to handle the following:
+
+    Album.many_to_many :popular_tags, :class=>:Tag do |ds|
+      ds.where{tags__popularity > 9000}
+    end
+    Album.where(:popular_tags=>[Tag[1], Tag[2]])
+
+  This will return all albums whose popular_tags would include
+  at least one of those two tags.  Previously, the block would
+  be ignored, returning albums containing one those tags even if
+  the tags weren't popular.
+
+* A table_select plugin has been added that changes the default
+  selection for models from * to table.*.  This is useful for
+  people who want ActiveRecord-like behavior instead of SQL-like
+  behavior, where joining tables doesn't automatically include
+  columns in the other table.
+
+  This can fix issues where joining another table that has columns
+  with the same name as columns in the model table without
+  specifying an explicit selection results in model objects being
+  returned where the values in the model object are the values
+  from the joined table instead of the model table.
+
+* Dataset#offset has been added, for specifying offset separately
+  from limit.  Previous this was possible via:
+
+    ds.limit(nil, offset)
+
+  but this is a friendlier API.
+
+* The jdbc adapter now has support for foreign key parsing.  This
+  is used if there is no specific support for the underlying
+  database.
+
+* Foreign key parsing is now supported on Oracle.
+
+= Other Improvements
+
+* Association add_*/remove_*/remove_all_* methods for
+  pg_array_to_many associations now work on unsaved model objects.
+
+* In the constraint_validations extension, deletes from the
+  metadata table are now processed before inserts, so that dropping
+  an existing constraint and readding a constraint with the same
+  name now works correctly.
+
+* Cloning an association now copies the :eager_block option
+  correctly from the source association if it was passed as
+  the block to the source association method.
+
+* Cloning a cloned association now copies the block for the
+  association.
+
+* The descendants method in the tree plugin no longer modifies an
+  array it is iterating over.
+
+* The jdbc/postgresql adapter now supports PostgreSQL-specific types,
+  with pretty much the same support as the postgres adapter.  When
+  using the pg_* extensions, the dataset will now handle the
+  PostgreSQL types correctly and return instances of the correct
+  Ruby classes (e.g. hstore is returned as Sequel::Postgres::HStore).
+
+  You should no longer need to use the typecast_on_load or
+  pg_typecast_on_load plugins when using model objects that use these
+  types when using the jdbc/postgresql adapter.
+
+* Offset emulation on Oracle now handles cases where selected
+  columns can't be ordered.
+
+* Offset emulation on DB2 no longer automatically orders on all
+  columns if the dataset itself is unordered.
+
+* Types containing spaces are now returning correctly when
+  parsing the schema in the oracle adapter.
+
+* Database#tables no longer returns tables in the recycle bin on
+  Oracle.
+
+* add_foreign_key now works correctly on HSQLDB, by splitting the
+  column addition and constraint addition into two separate
+  statements.
+
+* add_primary_key now works correctly on H2.