diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2016-01-14 17:30:05 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2016-01-14 17:30:05 -0500 |
| commit | 041caa8c9b303b7c3f612ff37caf6f8040680291 (patch) | |
| tree | 3cdfb70e3f8f8b6f4226ddbc0e00c234da503658 | |
| parent | beb351d3f525b62211f1adc6f21bf7d7063bd6bc (diff) | |
| download | sqlalchemy-041caa8c9b303b7c3f612ff37caf6f8040680291.tar.gz | |
- more docs
| -rw-r--r-- | doc/build/changelog/changelog_11.rst | 4 | ||||
| -rw-r--r-- | doc/build/changelog/migration_11.rst | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/elements.py | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/doc/build/changelog/changelog_11.rst b/doc/build/changelog/changelog_11.rst index 5fbcca45a..81637a0b4 100644 --- a/doc/build/changelog/changelog_11.rst +++ b/doc/build/changelog/changelog_11.rst @@ -39,7 +39,9 @@ .. seealso:: - :ref:`change_3501` + :ref:`change_3501` - feature overview + + :ref:`behavior_change_3501` - backwards compatibility remarks .. change:: :tags: feature, engine diff --git a/doc/build/changelog/migration_11.rst b/doc/build/changelog/migration_11.rst index 119bb00ee..ed2ae075f 100644 --- a/doc/build/changelog/migration_11.rst +++ b/doc/build/changelog/migration_11.rst @@ -468,7 +468,7 @@ positionally; in 1.1, when all columns are passed positionally, the correlation of these columns to the ultimate result set is also performed positionally. The key advantage here is that textual SQL can now be linked to an ORM- level result set without the need to deal with ambiguous or duplicate column -names, or with having to match labeling schemes to ORM-level column names. All +names, or with having to match labeling schemes to ORM-level labeling schemes. All that's needed now is the same ordering of columns within the textual SQL and the column arguments passed to :meth:`.TextClause.columns`:: @@ -509,7 +509,7 @@ this behavioral change for applications using it are at :ref:`behavior_change_35 :ref:`sqlexpression_text_columns` - in the Core tutorial - :ref:`behavior_change_3501` + :ref:`behavior_change_3501` - backwards compatibility remarks Positional matching is trusted over name-based matching for Core/ORM SQL constructs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py index 38264afab..de17aabb3 100644 --- a/lib/sqlalchemy/sql/elements.py +++ b/lib/sqlalchemy/sql/elements.py @@ -1360,6 +1360,12 @@ class TextClause(Executable, ClauseElement): .. deprecated:: 0.9.0 the :meth:`.TextClause.columns` method supersedes the ``typemap`` argument to :func:`.text`. + .. seealso:: + + :ref:`sqlexpression_text` - in the Core tutorial + + :ref:`orm_tutorial_literal_sql` - in the ORM tutorial + """ stmt = TextClause(text, bind=bind) if bindparams: |