diff options
Diffstat (limited to 'lib/sqlalchemy/sql')
| -rw-r--r-- | lib/sqlalchemy/sql/compiler.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/ddl.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/elements.py | 10 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/schema.py | 8 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/selectable.py | 6 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/type_api.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/util.py | 4 |
7 files changed, 18 insertions, 18 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index 31193ab17..169dc2cc3 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -2143,7 +2143,7 @@ class SQLCompiler(Compiled): c in implicit_return_defaults: self.returning.append(c) elif not c.primary_key: - # dont add primary key column to postfetch + # don't add primary key column to postfetch self.postfetch.append(c) else: values.append( diff --git a/lib/sqlalchemy/sql/ddl.py b/lib/sqlalchemy/sql/ddl.py index bda876502..2a282ed57 100644 --- a/lib/sqlalchemy/sql/ddl.py +++ b/lib/sqlalchemy/sql/ddl.py @@ -295,7 +295,7 @@ class DDL(DDLElement): %(fullname)s - the Table name including schema, quoted if needed The DDL's "context", if any, will be combined with the standard - substutions noted above. Keys present in the context will override + substitutions noted above. Keys present in the context will override the standard substitutions. """ @@ -394,7 +394,7 @@ class DDL(DDLElement): class _CreateDropBase(DDLElement): - """Base class for DDL constucts that represent CREATE and DROP or + """Base class for DDL constructs that represent CREATE and DROP or equivalents. The common theme of _CreateDropBase is a single diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py index 5ebc7478a..aef3a6c85 100644 --- a/lib/sqlalchemy/sql/elements.py +++ b/lib/sqlalchemy/sql/elements.py @@ -143,7 +143,7 @@ def type_coerce(expression, type_): passed to :func:`.type_coerce` as targets. For example, if a type implements the :meth:`.TypeEngine.bind_expression` method or :meth:`.TypeEngine.bind_processor` method or equivalent, - these functions will take effect at statement compliation/execution time + these functions will take effect at statement compilation/execution time when a literal value is passed, as in:: # bound-value handling of MyStringType will be applied to the @@ -158,7 +158,7 @@ def type_coerce(expression, type_): or a Python string which will be coerced into a bound literal value. :param type_: A :class:`.TypeEngine` class or instance indicating - the type to which the the expression is coerced. + the type to which the expression is coerced. .. seealso:: @@ -854,7 +854,7 @@ class BindParameter(ColumnElement): expr = users_table.c.name == 'Wendy' The above expression will produce a :class:`.BinaryExpression` - contruct, where the left side is the :class:`.Column` object + construct, where the left side is the :class:`.Column` object representing the ``name`` column, and the right side is a :class:`.BindParameter` representing the literal value:: @@ -1916,7 +1916,7 @@ class Case(ColumnElement): languages. It returns an instance of :class:`.Case`. :func:`.case` in its usual form is passed a list of "when" - contructs, that is, a list of conditions and results as tuples:: + constructs, that is, a list of conditions and results as tuples:: from sqlalchemy import case @@ -2508,7 +2508,7 @@ class BinaryExpression(ColumnElement): """Represent an expression that is ``LEFT <operator> RIGHT``. A :class:`.BinaryExpression` is generated automatically - whenever two column expressions are used in a Python binary expresion:: + whenever two column expressions are used in a Python binary expression:: >>> from sqlalchemy.sql import column >>> column('a') + column('b') diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py index 2aad60c8f..e8f1ffae1 100644 --- a/lib/sqlalchemy/sql/schema.py +++ b/lib/sqlalchemy/sql/schema.py @@ -1836,7 +1836,7 @@ class ColumnDefault(DefaultGenerator): def _maybe_wrap_callable(self, fn): """Wrap callables that don't accept a context. - This is to allow easy compatiblity with default callables + This is to allow easy compatibility with default callables that aren't specific to accepting of a context. """ @@ -2785,7 +2785,7 @@ class Index(DialectKWArgs, ColumnCollectionMixin, SchemaItem): :param \*expressions: Column expressions to include in the index. The expressions are normally instances of :class:`.Column`, but may also - be arbitrary SQL expressions which ultmately refer to a + be arbitrary SQL expressions which ultimately refer to a :class:`.Column`. :param unique=False: @@ -2973,7 +2973,7 @@ class MetaData(SchemaItem): The values associated with each "constraint class" or "constraint mnemonic" key are string naming templates, such as ``"uq_%(table_name)s_%(column_0_name)s"``, - which decribe how the name should be composed. The values associated + which describe how the name should be composed. The values associated with user-defined "token" keys should be callables of the form ``fn(constraint, table)``, which accepts the constraint/index object and :class:`.Table` as arguments, returning a string @@ -3387,7 +3387,7 @@ class ThreadLocalMetaData(MetaData): self.__engines[bind] = e self.context._engine = e else: - # TODO: this is squirrely. we shouldnt have to hold onto engines + # TODO: this is squirrely. we shouldn't have to hold onto engines # in a case like this if bind not in self.__engines: self.__engines[bind] = bind diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py index afcf437e9..61abe815d 100644 --- a/lib/sqlalchemy/sql/selectable.py +++ b/lib/sqlalchemy/sql/selectable.py @@ -2060,7 +2060,7 @@ class Select(HasPrefixes, GenerativeSelect): Use this parameter to explicitly specify "from" objects which are not automatically locatable. This could include :class:`~sqlalchemy.schema.Table` objects that aren't otherwise present, - or :class:`.Join` objects whose presence will supercede that of the + or :class:`.Join` objects whose presence will supersede that of the :class:`~sqlalchemy.schema.Table` objects already located in the other clauses. @@ -2403,7 +2403,7 @@ class Select(HasPrefixes, GenerativeSelect): # here is the same item is _correlate as in _from_obj but the # _correlate version has an annotation on it - (specifically # RelationshipProperty.Comparator._criterion_exists() does - # this). Also keep _correlate liberally open with it's previous + # this). Also keep _correlate liberally open with its previous # contents, as this set is used for matching, not rendering. self._correlate = set(clone(f) for f in self._correlate).union(self._correlate) @@ -2411,7 +2411,7 @@ class Select(HasPrefixes, GenerativeSelect): # 4. clone other things. The difficulty here is that Column # objects are not actually cloned, and refer to their original # .table, resulting in the wrong "from" parent after a clone - # operation. Hence _from_cloned and _from_obj supercede what is + # operation. Hence _from_cloned and _from_obj supersede what is # present here. self._raw_columns = [clone(c, **kw) for c in self._raw_columns] for attr in '_whereclause', '_having', '_order_by_clause', \ diff --git a/lib/sqlalchemy/sql/type_api.py b/lib/sqlalchemy/sql/type_api.py index 1f534c55e..48b447b37 100644 --- a/lib/sqlalchemy/sql/type_api.py +++ b/lib/sqlalchemy/sql/type_api.py @@ -1050,7 +1050,7 @@ def adapt_type(typeobj, colspecs): except KeyError: pass else: - # couldnt adapt - so just return the type itself + # couldn't adapt - so just return the type itself # (it may be a user-defined type) return typeobj # if we adapted the given generic type to a database-specific type, diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py index 50ce30aaf..639f53ddc 100644 --- a/lib/sqlalchemy/sql/util.py +++ b/lib/sqlalchemy/sql/util.py @@ -94,7 +94,7 @@ def visit_binary_product(fn, expr): def visit(element): if isinstance(element, ScalarSelect): - # we dont want to dig into correlated subqueries, + # we don't want to dig into correlated subqueries, # those are just column elements by themselves yield element elif element.__visit_name__ == 'binary' and \ @@ -321,7 +321,7 @@ def reduce_columns(columns, *clauses, **kw): This function is primarily used to determine the most minimal "primary key" from a selectable, by reducing the set of primary key columns present - in the the selectable to just those that are not repeated. + in the selectable to just those that are not repeated. """ ignore_nonexistent_tables = kw.pop('ignore_nonexistent_tables', False) |