Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Minor doc fixes. #602

Merged
merged 2 commits into from

2 participants

@chanks

A couple of typos, and there were a couple of places were exclusion_constraint() was used inside a create_table block, instead of exclude().

@jeremyevans
Owner

This looks good, I'll merge it soon. Thanks for the help!

@jeremyevans jeremyevans merged commit e3a47cb into jeremyevans:master
@chanks chanks deleted the chanks:typos branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 12, 2013
  1. @chanks

    Fix some minor typos.

    chanks authored
  2. @chanks
This page is out of date. Refresh to see the latest.
View
2  doc/release_notes/3.37.0.txt
@@ -162,7 +162,7 @@
DB.create_table(:t) do
...
- exclusion_constraint([[:col1, '&&'], [:col2, '=']])
+ exclude([[:col1, '&&'], [:col2, '=']])
# EXCLUDE USING gist (col1 WITH &&, col2 WITH =)
end
View
4 lib/sequel/adapters/shared/postgres.rb
@@ -53,14 +53,14 @@ class << self
end
class CreateTableGenerator < Sequel::Schema::Generator
- # Add an exclusion constraint when creating the table. elements should be
+ # Add an exclusion constraint when creating the table. Elements should be
# an array of 2 element arrays, with the first element being the column or
# expression the exclusion constraint is applied to, and the second element
# being the operator to use for the column/expression to check for exclusion.
#
# Example:
#
- # exclusion_constraint([[:col1, '&&'], [:col2, '=']])
+ # exclude([[:col1, '&&'], [:col2, '=']])
# # EXCLUDE USING gist (col1 WITH &&, col2 WITH =)
#
# Options supported:
View
2  lib/sequel/plugins/identity_map.rb
@@ -36,7 +36,7 @@ module IdentityMap
module ClassMethods
# Override the default :eager_loader option for many_*_many associations to work
# with an identity_map. If the :eager_graph association option is used, you'll probably have to use
- # :uniq=>true on the current association amd :cartesian_product_number=>2 on the association
+ # :uniq=>true on the current association and :cartesian_product_number=>2 on the association
# mentioned by :eager_graph, otherwise you'll end up with duplicates because the row proc will be
# getting called multiple times for the same object. If you do have duplicates and you use :eager_graph,
# they'll probably be lost. Making that work correctly would require changing a lot of the core
View
2  lib/sequel/plugins/tactical_eager_loading.rb
@@ -60,7 +60,7 @@ def load_associated_objects(opts, reload=false)
module DatasetMethods
private
- # Set the reteived_with and retrieved_by attributes for the object
+ # Set the retrieved_with and retrieved_by attributes for the object
# with the current dataset and array of all objects.
def post_load(objects)
super
View
2  spec/extensions/tactical_eager_loading_spec.rb
@@ -25,7 +25,7 @@ class ::TaticalEagerLoadingModel < Sequel::Model
Object.send(:remove_const, :TaticalEagerLoadingModel)
end
- it "Dataset#all should set the retrieved_by and reteived_with attributes" do
+ it "Dataset#all should set the retrieved_by and retrieved_with attributes" do
ts = @c.all
ts.map{|x| [x.retrieved_by, x.retrieved_with]}.should == [[@ds,ts], [@ds,ts], [@ds,ts], [@ds,ts]]
end
Something went wrong with that request. Please try again.