summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add SKIP LOCKED support for Postgresql, Oracle"mike bayer2016-06-031-2/+4
|\
| * Add SKIP LOCKED support for Postgresql, OracleJack Zhou2016-06-021-2/+4
| | | | | | | | | | | | | | | | This adds `SELECT ... FOR UPDATE SKIP LOCKED`/ `SELECT ... FOR SHARE SKIP LOCKED` rendering. Change-Id: Id1dc4f1cafc1de23f397a6f73d54ab2c58d5910d Pull-request: https://bitbucket.org/zzzeek/sqlalchemy/pull-requests/86
* | Add an init_scalar event for attributesMike Bayer2016-06-022-5/+114
|/ | | | | | | | | This allows us to build default-setting recipes such as one that allows us to actively read column-level defaults. An example suite is also added. Change-Id: I7b022d52cc89526132d5bc4201ac27fea4cf088d Fixes: #1311
* Merge remote-tracking branch 'origin/pr/270'Mike Bayer2016-05-241-1/+1
|\
| * Spelling fixes: "the a"Ville Skyttä2016-05-051-1/+1
| |
* | Accommodate "callable" bound param in evaluatorMike Bayer2016-05-161-1/+4
| | | | | | | | | | | | | | | | | | | | Fixed bug in "evaluate" strategy of :meth:`.Query.update` and :meth:`.Query.delete` which would fail to accommodate a bound parameter with a "callable" value, as which occurs when filtering by a many-to-one equality expression along a relationship. Change-Id: I47758d3f5d8b9ea1a07e23166780d5f3c32b17f1 Fixes: #3700
* | Check for duplicate calls to register_attribute_implMike Bayer2016-05-101-3/+15
| | | | | | | | | | | | | | | | | | | | Fixed bug whereby the event listeners used for backrefs could be inadvertently applied multiple times, when using a deep class inheritance hierarchy in conjunction with mutiple mapper configuration steps. Change-Id: I712beaf4674e2323bf5b282922658020a6d00b53 Fixes: #3710
* | Repair _orm_columns() to accommodate text()Mike Bayer2016-05-051-1/+1
|/ | | | | | | | | Fixed bug whereby passing a :func:`.text` construct to the :meth:`.Query.group_by` method would raise an error, instead of intepreting the object as a SQL fragment. Change-Id: I5fc2f590b76508d52e23b5fa9cf037ddea8080c3 fixes: #3706
* Corrects some references in ORM documentation.pr/267Jeffrey Finkelstein2016-05-031-8/+10
|
* Merge "Deprecate Mapper.order_by"mike bayer2016-04-191-0/+9
|\
| * Deprecate Mapper.order_byMike Bayer2016-04-191-0/+9
| | | | | | | | | | | | | | | | | | | | | | This is an old parameter no longer relevant to how SQLAlchemy works, once the Query object was introduced. By deprecating it we establish that we aren't supporting non-working use cases and that we encourage applications to move off of the use of this parameter. Fixes: #3394 Change-Id: I25b9a38142a1537bbcb27d3e8b66a8b265140072
* | Rename Query._mapper_zero() to Query._entity_zero()Mike Bayer2016-04-191-17/+15
|/ | | | | | | | | | | | To be more descriptive of the use of _mapper_zero(), rename it to _entity_zero(), but also supply a new _mapper_zero() function that more strictly returns a mapper. The existing _entity_zero() function is renamed to _query_entity_zero. _only_mapper_zero() is removed as it isn't used. Divide up the existing calling functions to refer to the appropriate new method. Change-Id: I8780c3235e87b4936c6daf64d9d299b22b6e1260 Fixes: #3608
* Add raise/raiseload relationship loading strategyAdrian Moennich2016-04-194-0/+65
| | | | | | | Fixes: #3512 Co-Authored-By: Mike Bayer <mike_mp@zzzcomputing.com> Change-Id: Ibd126c50eda621e2f4120ee378f7313af2d7ec3c Pull-request: https://github.com/zzzeek/sqlalchemy/pull/193
* Fix typo from "addreses" to "addresses"Rachid Belaid2016-04-061-1/+1
|
* - don't load deferred columns on unexpire for merge with load=False,Diana Clarke2016-04-063-2/+20
| | | | | | | fixes #3488 Change-Id: Ic9577b800e4a4e2465ec7f3a2e95bd231f5337ee Co-Authored-By: Mike Bayer <mike_mp@zzzcomputing.com>
* - Added support for rendering "FULL OUTER JOIN" to both Core and ORM.Mike Bayer2016-03-282-23/+37
| | | | Pull request courtesy Stefan Urbanek. fixes #1957
* - Further continuing on the common MySQL exception case ofMike Bayer2016-03-231-12/+31
| | | | | | | | | a savepoint being cancelled first covered in :ticket:`2696`, the failure mode in which the :class:`.Session` is placed when a SAVEPOINT vanishes before rollback has been improved to allow the :class:`.Session` to still function outside of that savepoint. It is assumed that the savepoint operation failed and was cancelled. fixes #3680
* - Fixed bug where a newly inserted instance that is rolled backMike Bayer2016-03-142-16/+31
| | | | | | | | | would still potentially cause persistence conflicts on the next transaction, because the instance would not be checked that it was expired. This fix will resolve a large class of cases that erronously cause the "New instance with identity X conflicts with persistent instance Y" error. fixes #3677
* Adds documentation to Query.slice().pr/247jfinkels2016-03-131-3/+28
|
* - An improvement to the workings of :meth:`.Query.correlate` suchMike Bayer2016-02-251-5/+8
| | | | | | | that when a "polymorphic" entity is used which represents a straight join of several tables, the statement will ensure that all the tables within the join are part of what's correlating. fixes #3662
* - reworked the way the "select_wraps_for" expression isMike Bayer2016-02-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | handled within visit_select(); this attribute was added in the 1.0 series to accommodate the subquery wrapping behavior of SQL Server and Oracle while also working with positional column targeting and no longer relying upon "key fallback" in order to target columns in such a statement. The IBM DB2 third-party dialect also has this use case, but its implementation is using regular expressions to rewrite the textual SELECT only and does not make use of a "wrapped" select at this time. The logic no longer attempts to reconcile proxy set collections as this was not deterministic, and instead assumes that the select() and the wrapper select() match their columns postionally, at least for the column positions they have in common, so it is now very simple and safe. fixes #3657. - as a side effect of #3657 it was also revealed that the strategy of calling upon a ResultProxy._getter was not correctly calling into NoSuchColumnError when an expected column was not present, and instead returned None up to loading.instances() to produce NoneType failures; added a raiseerr argument to _getter() which is called when we aren't expecting None, fixes #3658.
* - Fixed bug which would cause an eagerly loaded many-to-one attributeMike Bayer2016-02-171-7/+13
| | | | | | | | to not be loaded, if the joined eager load were from a row where the same entity were present multiple times, some calling for the attribute to be eagerly loaded and others not. The logic here is revised to take in the attribute even though a different loader path has handled the parent entity already. fixes #3431
* - Fixed bug in :meth:`.Session.merge` where an object with a compositeMike Bayer2016-02-111-2/+3
| | | | | | | | primary key that has values for some but not all of the PK fields would emit a SELECT statement leaking the internal NEVER_SET symbol into the query, rather than detecting that this object does not have a searchable primary key and no SELECT should be emitted. fixes #3647
* - CTE functionality has been expanded to support all DML, allowingMike Bayer2016-02-111-3/+1
| | | | | | | INSERT, UPDATE, and DELETE statements to both specify their own WITH clause, as well as for these statements themselves to be CTE expressions when they include a RETURNING clause. fixes #2551
* - A refinement to the logic which adds columns to the resulting SQL whenMike Bayer2016-02-091-15/+11
| | | | | | | | | | | | | :meth:`.Query.distinct` is combined with :meth:`.Query.order_by` such that columns which are already present will not be added a second time, even if they are labeled with a different name. Regardless of this change, the extra columns added to the SQL have never been returned in the final result, so this change only impacts the string form of the statement as well as its behavior when used in a Core execution context. Additionally, columns are no longer added when the DISTINCT ON format is used, provided the query is not wrapped inside a subquery due to joined eager loading. fixes #3641
* - fully hyperlink the docstring for make_transientMike Bayer2016-02-082-12/+48
| | | | | | | | | - establish make_transient and make_transient_to_detached as special-use, advanced use only functions - list all conditions under make_transient() under which an attribute will not be loaded and establish that make_transient() does not attempt to load all attributes before detaching the object from its session, fixes #3640
* - happy new yearMike Bayer2016-01-2929-29/+29
|
* - revert the change first made in a6fe4dc, as we are now generalizingMike Bayer2016-01-281-14/+2
| | | | | | | | | | | | | | | | | | | | | | | the warning here to all safe_reraise() cases in Python 2. - Revisiting :ticket:`2696`, first released in 1.0.10, which attempts to work around Python 2's lack of exception context reporting by emitting a warning for an exception that was interrupted by a second exception when attempting to roll back the already-failed transaction; this issue continues to occur for MySQL backends in conjunction with a savepoint that gets unexpectedly lost, which then causes a "no such savepoint" error when the rollback is attempted, obscuring what the original condition was. The approach has been generalized to the Core "safe reraise" function which takes place across the ORM and Core in any place that a transaction is being rolled back in response to an error which occurred trying to commit, including the context managers provided by :class:`.Session` and :class:`.Connection`, and taking place for operations such as a failure on "RELEASE SAVEPOINT". Previously, the fix was only in place for a specific path within the ORM flush/commit process; it now takes place for all transational context managers as well. fixes #2696
* - Added new parameter :paramref:`.orm.mapper.passive_deletes` toMike Bayer2016-01-202-1/+44
| | | | | | | | available mapper options. This allows a DELETE to proceed for a joined-table inheritance mapping against the base table only, while allowing for ON DELETE CASCADE to handle deleting the row from the subclass tables. fixes #2349
* - the order in which _generate_backref() for different mappers is calledMike Bayer2016-01-191-1/+1
| | | | | is random; therefore it may be called against the subclass mapper first, so need to check .concrete on both sides, references #3630
* - Fixed issue where two same-named relationships that refer toMike Bayer2016-01-192-10/+16
| | | | | | | | a base class and a concrete-inherited subclass would raise an error if those relationships were set up using "backref", while setting up the identical configuration using relationship() instead with the conflicting names would succeed, as is allowed in the case of a concrete mapping. fixes #3630
* - The ``str()`` call for :class:`.Query` will now take into accountMike Bayer2016-01-191-7/+20
| | | | | | | | | | | | the :class:`.Engine` to which the :class:`.Session` is bound, when generating the string form of the SQL, so that the actual SQL that would be emitted to the database is shown, if possible. Previously, only the engine associated with the :class:`.MetaData` to which the mappings are associated would be used, if present. If no bind can be located either on the :class:`.Session` or on the :class:`.MetaData` to which the mappings are associated, then the "default" dialect is used to render the SQL, as was the case previously. fixes #3081
* - refactor a bit the loader options system to make it a bit moreMike Bayer2016-01-101-31/+38
| | | | | intelligible, given the fixes for ref #3623. unfortunately the system is still quite weird even though it was rewritten to be... less weird
* - Fixed regression since 0.9 where the 0.9 style loader optionsMike Bayer2016-01-092-4/+23
| | | | | | | system failed to accommodate for multiple :func:`.undefer_group` loader options in a single query. Multiple :func:`.undefer_group` options will now be taken into account even against the same entity. fixes #3623
* Merged in jvanasco/sqlalchemy-alt/issue_docs_scoped_session (pull request #50)Mike Bayer2016-01-071-4/+11
|\ | | | | | | updated docstrings for orm.scoping
| * updated sphinx tagetingjonathan vanasco2015-04-021-8/+10
| |
| * updates to scoping docs to make `.session_factory` appear publicjonathan vanasco2015-04-021-2/+7
| |
* | - remove errant pdb, references #3612Mike Bayer2015-12-151-5/+1
| |
* | - Fixed bug in baked loader system where the systemwide monkeypatchMike Bayer2015-12-151-1/+5
| | | | | | | | | | | | | | | | for setting up baked lazy loaders would interfere with other loader strategies that rely on lazy loading as a fallback, e.g. joined and subquery eager loaders, leading to ``IndexError`` exceptions at mapper configuration time. fixes #3612
* | - Fixed regression caused in 1.0.10 by the fix for :ticket:`3593` whereMike Bayer2015-12-151-1/+3
| | | | | | | | | | | | | | the check added for a polymorphic joinedload from a poly_subclass->class->poly_baseclass connection would fail for the scenario of class->poly_subclass->class. fixes #3611
* | - since we are mutating the statement in a loop, start withMike Bayer2015-12-141-3/+8
| | | | | | | | | | | | the same cached starting statement each time. no issue has been observed with the former but it could perhaps have issues w/ versioning or eager_defaults
* | - Fixed bug where :meth:`.Session.bulk_update_mappings` and relatedMike Bayer2015-12-141-1/+1
| | | | | | | | | | | | | | | | would not bump a version id counter when in use. The experience here is still a little rough as the original version id is required in the given dictionaries and there's not clean error reporting on that yet. fixes #3610
* | - Fixed bug in :meth:`.Update.return_defaults` which would cause allMike Bayer2015-12-142-14/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | insert-default holding columns not otherwise included in the SET clause (such as primary key cols) to get rendered into the RETURNING even though this is an UPDATE. - Major fixes to the :paramref:`.Mapper.eager_defaults` flag, this flag would not be honored correctly in the case that multiple UPDATE statements were to be emitted, either as part of a flush or a bulk update operation. Additionally, RETURNING would be emitted unnecessarily within update statements. fixes #3609
* | - Fixed bug where use of the :meth:`.Query.select_from` method wouldMike Bayer2015-12-121-1/+5
| | | | | | | | | | | | cause a subsequent call to the :meth:`.Query.with_parent` method to fail. fixes #3606 - add mark-as-fail test for #3607
* | - convert ORM tutorial and basic_relationships to favorMike Bayer2015-12-101-0/+5
| | | | | | | | | | back_populates while still maintaining great familiarity w/ backref so as not to confuse people. fixes #3390
* | Merge remote-tracking branch 'origin/pr/220'Mike Bayer2015-12-102-2/+2
|\ \
| * | fix some typospr/220Nils Philippsen2015-12-082-2/+2
| | |
* | | - refactor of adapt_like_to_iterable(), fixes #3457.Mike Bayer2015-12-094-85/+65
|/ / | | | | | | | | | | Includes removal of adapt_like_to_iterable() as well as _set_iterable(), uses __slots__ for collectionadapter, does much less duck typing of collections.
* | - write a real inline documentation section for from_self(),Mike Bayer2015-12-071-2/+163
| | | | | | | | | | building on the example of query.join(). Ideally all the methods in Query would have this kind of thing. fixes #3544
* | - fix loading.py merge_result for new _merge() argumentMike Bayer2015-12-041-2/+2
| |