diff options
Diffstat (limited to 'lib/sqlalchemy/sql')
| -rw-r--r-- | lib/sqlalchemy/sql/annotation.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/base.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/compiler.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/crud.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/elements.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/lambdas.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/operators.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/selectable.py | 14 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/util.py | 4 |
9 files changed, 20 insertions, 20 deletions
diff --git a/lib/sqlalchemy/sql/annotation.py b/lib/sqlalchemy/sql/annotation.py index b29c9cc66..23b5052a9 100644 --- a/lib/sqlalchemy/sql/annotation.py +++ b/lib/sqlalchemy/sql/annotation.py @@ -306,7 +306,7 @@ def _shallow_annotate(element, annotations): """Annotate the given ClauseElement and copy its internals so that internal objects refer to the new annotated object. - Basically used to apply a "dont traverse" annotation to a + Basically used to apply a "don't traverse" annotation to a selectable, without digging throughout the whole structure wasting time. """ diff --git a/lib/sqlalchemy/sql/base.py b/lib/sqlalchemy/sql/base.py index 220bbb115..fe9455fb9 100644 --- a/lib/sqlalchemy/sql/base.py +++ b/lib/sqlalchemy/sql/base.py @@ -543,7 +543,7 @@ class Generative(HasMemoized): class InPlaceGenerative(HasMemoized): """Provide a method-chaining pattern in conjunction with the - @_generative decorator taht mutates in place.""" + @_generative decorator that mutates in place.""" def _generate(self): skip = self._memoized_keys @@ -653,7 +653,7 @@ class Options(util.with_metaclass(_MetaOptions)): d = other._state_dict() # only support a merge with another object of our class - # and which does not have attrs that we dont. otherwise + # and which does not have attrs that we don't. otherwise # we risk having state that might not be part of our cache # key strategy diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index ef7db0bbe..aabc257eb 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -711,7 +711,7 @@ class SQLCompiler(Compiled): expect that they are to be invoked in an "executemany" style, which may impact how the statement will be expected to return the values of defaults and autoincrement / sequences and similar. - Depending on the backend and driver in use, support for retreiving + Depending on the backend and driver in use, support for retrieving these values may be disabled which means SQL expressions may be rendered inline, RETURNING may not be rendered, etc. @@ -4684,7 +4684,7 @@ class IdentifierPreparer(object): return self.quote(schema) def quote(self, ident, force=None): - """Conditionally quote an identfier. + """Conditionally quote an identifier. The identifier is quoted if it is a reserved word, contains quote-necessary characters, or is an instance of diff --git a/lib/sqlalchemy/sql/crud.py b/lib/sqlalchemy/sql/crud.py index f67e76181..8b4950aa3 100644 --- a/lib/sqlalchemy/sql/crud.py +++ b/lib/sqlalchemy/sql/crud.py @@ -400,7 +400,7 @@ def _scan_cols( # if we have to invoke a server-side function, we need # to pre-execute it. or if this is a straight # autoincrement column and the dialect supports it - # we can use curosr.lastrowid. + # we can use cursor.lastrowid. _append_param_insert_pk_no_returning( compiler, stmt, c, values, kw @@ -607,7 +607,7 @@ def _append_param_insert_pk_no_returning(compiler, stmt, c, values, kw): ) or # column has no default on it, but dialect can run the - # "autoincrement" mechanism explictly, e.g. PostrgreSQL + # "autoincrement" mechanism explicitly, e.g. PostgreSQL # SERIAL we know the sequence name ( c.default is None diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py index 5ea3526ea..a9f21cd5f 100644 --- a/lib/sqlalchemy/sql/elements.py +++ b/lib/sqlalchemy/sql/elements.py @@ -2242,7 +2242,7 @@ class BooleanClauseList(ClauseList, ColumnElement): lcc = 1 else: against = operator - # techincally this would be len(convert_clauses) + 1 + # technically this would be len(convert_clauses) + 1 # however this only needs to indicate "greater than one" lcc = 2 convert_clauses.append(clause) @@ -2550,7 +2550,7 @@ class Tuple(ClauseList, ColumnElement): ) def self_group(self, against=None): - # Tuple is parenthsized by definition. + # Tuple is parenthesized by definition. return self diff --git a/lib/sqlalchemy/sql/lambdas.py b/lib/sqlalchemy/sql/lambdas.py index 92c3ac9f7..2ffed2788 100644 --- a/lib/sqlalchemy/sql/lambdas.py +++ b/lib/sqlalchemy/sql/lambdas.py @@ -1001,7 +1001,7 @@ class AnalyzedFunction(object): # additionally, each PyWrapper will log that it did in fact # create a parameter, otherwise, it's some kind of Python # object in the closure and we want to track that, to make - # sure it doesn't change to somehting else, or if it does, + # sure it doesn't change to something else, or if it does, # that we create a different tracked function with that # variable. self.expr = lambda_element._invoke_user_fn(tracker_instrumented_fn) diff --git a/lib/sqlalchemy/sql/operators.py b/lib/sqlalchemy/sql/operators.py index a7dfa9b6d..60f03195c 100644 --- a/lib/sqlalchemy/sql/operators.py +++ b/lib/sqlalchemy/sql/operators.py @@ -542,7 +542,7 @@ class ColumnOperators(Operators): In this calling form, the expression renders an "empty set" expression. These expressions are tailored to individual backends - and are generaly trying to get an empty SELECT statement as a + and are generally trying to get an empty SELECT statement as a subquery. Such as on SQLite, the expression is:: WHERE col IN (SELECT 1 FROM (SELECT 1) WHERE 1!=1) diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py index 8e478583f..7deb7fd82 100644 --- a/lib/sqlalchemy/sql/selectable.py +++ b/lib/sqlalchemy/sql/selectable.py @@ -88,7 +88,7 @@ def subquery(alias, *args, **kwargs): class ReturnsRows(roles.ReturnsRowsRole, ClauseElement): - """The basemost class for Core constructs that have some concept of + """The base-most class for Core constructs that have some concept of columns that can represent rows. While the SELECT statement and TABLE are the primary things we think @@ -825,7 +825,7 @@ class FromClause(roles.AnonymizedFromClauseRole, Selectable): this is used to "ping" a derived selectable to add a new column to its .c. collection when a Column has been added to one of the - Table objects it ultimtely derives from. + Table objects it ultimately derives from. If the given selectable hasn't populated its .c. collection yet, it should at least pass on the message to the contained selectables, @@ -4414,7 +4414,7 @@ class Select( .. versionadded:: 1.4 - The :func:`_sql.select` function now accepts column arguments positionally. The top-level :func:`_sql.select` function will automatically use the 1.x or 2.x style API based on - the incoming argumnents; using :func:`_future.select` from the + the incoming arguments; using :func:`_future.select` from the ``sqlalchemy.future`` module will enforce that only the 2.x style constructor is used. @@ -4587,7 +4587,7 @@ class Select( stmt = select(user_table).join(address_table, user_table.c.id == address_table.c.user_id) - The above statement generages SQL similar to:: + The above statement generates SQL similar to:: SELECT user.id, user.name FROM user JOIN address ON user.id = address.user_id @@ -4672,7 +4672,7 @@ class Select( user_table, address_table, user_table.c.id == address_table.c.user_id ) - The above statement generages SQL similar to:: + The above statement generates SQL similar to:: SELECT user.id, user.name, address.id, address.email, address.user_id FROM user JOIN address ON user.id = address.user_id @@ -4966,7 +4966,7 @@ class Select( .. versionchanged:: 1.4 the :meth:`_sql.Select.with_only_columns` method accepts the list of column expressions positionally; - passing the expressions as a list is deprecateed. + passing the expressions as a list is deprecated. """ @@ -5271,7 +5271,7 @@ class Select( # when use_labels is on: # in all cases == if we see the same label name, use _label_anon_label - # for subsequent occurences of that label + # for subsequent occurrences of that label # # anon_for_dupe_key == if we see the same column object multiple # times under a particular name, whether it's the _label name or the diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py index df805c557..5f35de5f0 100644 --- a/lib/sqlalchemy/sql/util.py +++ b/lib/sqlalchemy/sql/util.py @@ -504,7 +504,7 @@ class _repr_row(_repr_base): class _repr_params(_repr_base): """Provide a string view of bound parameters. - Truncates display to a given numnber of 'multi' parameter sets, + Truncates display to a given number of 'multi' parameter sets, as well as long values to a given number of characters. """ @@ -852,7 +852,7 @@ class ClauseAdapter(visitors.ReplacingExternalTraversal): ): # we are a SELECT statement and not derived from an alias of a # table (which nonetheless may be a table our SELECT derives - # from), so return the alias to prevent futher traversal + # from), so return the alias to prevent further traversal # or # we are an alias of a table and we are not derived from an # alias of a table (which nonetheless may be the same table |