Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Minor doc fixes. #602

Merged
merged 2 commits into from over 1 year ago

2 participants

Chris Hanks Jeremy Evans
Chris Hanks

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

Jeremy Evans
Owner

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

Jeremy Evans jeremyevans merged commit e3a47cb into from January 12, 2013
Jeremy Evans jeremyevans closed this January 12, 2013
Chris Hanks chanks deleted the branch January 12, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 2 unique commits by 1 author.

Jan 12, 2013
Chris Hanks Fix some minor typos. ec9fe80
Chris Hanks Fix a couple places in the docs where exclusion_constraint() is used …
…instead of exclude().
e3a47cb
This page is out of date. Refresh to see the latest.
2  doc/release_notes/3.37.0.txt
@@ -162,7 +162,7 @@
162 162
 
163 163
     DB.create_table(:t) do
164 164
       ...
165  
-      exclusion_constraint([[:col1, '&&'], [:col2, '=']])
  165
+      exclude([[:col1, '&&'], [:col2, '=']])
166 166
       # EXCLUDE USING gist (col1 WITH &&, col2 WITH =)
167 167
     end
168 168
 
4  lib/sequel/adapters/shared/postgres.rb
@@ -53,14 +53,14 @@ class << self
53 53
     end
54 54
 
55 55
     class CreateTableGenerator < Sequel::Schema::Generator
56  
-      # Add an exclusion constraint when creating the table. elements should be
  56
+      # Add an exclusion constraint when creating the table. Elements should be
57 57
       # an array of 2 element arrays, with the first element being the column or
58 58
       # expression the exclusion constraint is applied to, and the second element
59 59
       # being the operator to use for the column/expression to check for exclusion.
60 60
       #
61 61
       # Example:
62 62
       #
63  
-      #   exclusion_constraint([[:col1, '&&'], [:col2, '=']])
  63
+      #   exclude([[:col1, '&&'], [:col2, '=']])
64 64
       #   # EXCLUDE USING gist (col1 WITH &&, col2 WITH =)
65 65
       #
66 66
       # Options supported:
2  lib/sequel/plugins/identity_map.rb
@@ -36,7 +36,7 @@ module IdentityMap
36 36
       module ClassMethods
37 37
         # Override the default :eager_loader option for many_*_many associations to work
38 38
         # with an identity_map.  If the :eager_graph association option is used, you'll probably have to use
39  
-        # :uniq=>true on the current association amd :cartesian_product_number=>2 on the association
  39
+        # :uniq=>true on the current association and :cartesian_product_number=>2 on the association
40 40
         # mentioned by :eager_graph, otherwise you'll end up with duplicates because the row proc will be
41 41
         # getting called multiple times for the same object.  If you do have duplicates and you use :eager_graph,
42 42
         # they'll probably be lost.  Making that work correctly would require changing a lot of the core
2  lib/sequel/plugins/tactical_eager_loading.rb
@@ -60,7 +60,7 @@ def load_associated_objects(opts, reload=false)
60 60
       module DatasetMethods
61 61
         private
62 62
 
63  
-        # Set the reteived_with and retrieved_by attributes for the object
  63
+        # Set the retrieved_with and retrieved_by attributes for the object
64 64
         # with the current dataset and array of all objects.
65 65
         def post_load(objects)
66 66
           super
2  spec/extensions/tactical_eager_loading_spec.rb
@@ -25,7 +25,7 @@ class ::TaticalEagerLoadingModel < Sequel::Model
25 25
     Object.send(:remove_const, :TaticalEagerLoadingModel)
26 26
   end
27 27
 
28  
-  it "Dataset#all should set the retrieved_by and reteived_with attributes" do
  28
+  it "Dataset#all should set the retrieved_by and retrieved_with attributes" do
29 29
     ts = @c.all
30 30
     ts.map{|x| [x.retrieved_by, x.retrieved_with]}.should == [[@ds,ts], [@ds,ts], [@ds,ts], [@ds,ts]]
31 31
   end
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.