From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 21 Mar 2012 00:12:26 +0000 (-0400)
Subject: - 0.7.7
X-Git-Tag: rel_0_7_7~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=565b5dc537e8c155fb85878d477180a4c954b81f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- 0.7.7
- [feature] Added prefix_with() method
to Query, calls upon select().prefix_with()
to allow placement of MySQL SELECT
directives in statements.  Courtesy
Diana Clarke [ticket:2443]
---

diff --git a/CHANGES b/CHANGES
index 67e5335ee2..3df56fd942 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,15 @@
 =======
 CHANGES
 =======
+0.7.7
+=====
+- orm
+  - [feature] Added prefix_with() method
+    to Query, calls upon select().prefix_with()
+    to allow placement of MySQL SELECT
+    directives in statements.  Courtesy
+    Diana Clarke [ticket:2443]
+
 0.7.6
 =====
 - orm
diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index 03293b5dd9..4e00437ea9 100644
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -117,7 +117,7 @@ from sqlalchemy.engine import create_engine, engine_from_config
 __all__ = sorted(name for name, obj in locals().items()
                  if not (name.startswith('_') or inspect.ismodule(obj)))
 
-__version__ = '0.7.6'
+__version__ = '0.7.7'
 
 del inspect, sys
 
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index aa3dd0173e..56d377f186 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -77,6 +77,7 @@ class Query(object):
     _group_by = False
     _having = None
     _distinct = False
+    _prefixes = None
     _offset = None
     _limit = None
     _statement = None
@@ -917,7 +918,8 @@ class Query(object):
                 '_order_by', '_group_by',
                 '_limit', '_offset', 
                 '_joinpath', '_joinpoint', 
-                '_distinct', '_having'
+                '_distinct', '_having', 
+                '_prefixes',
         ):
             self.__dict__.pop(attr, None)
         self._set_select_from(fromclause)
@@ -2057,6 +2059,33 @@ class Query(object):
             else: 
                 self._distinct = criterion 
 
+    @_generative()
+    def prefix_with(self, *prefixes):
+        """Apply the prefixes to the query and return the newly resulting
+        ``Query``.
+
+        :param \*prefixes: optional prefixes, typically strings, 
+        not using any commas.   In particular is useful for MySQL keywords.
+
+        e.g.::
+
+            query = sess.query(User.name).\\
+                prefix_with('HIGH_PRIORITY').\\
+                prefix_with('SQL_SMALL_RESULT', 'ALL')
+
+        Would render::
+
+            SELECT HIGH_PRIORITY SQL_SMALL_RESULT ALL users.name AS users_name 
+            FROM users
+        
+        New in 0.7.7.
+
+        """
+        if self._prefixes:
+            self._prefixes += prefixes
+        else:
+            self._prefixes = prefixes
+
     def all(self):
         """Return the results represented by this ``Query`` as a list.
 
@@ -2468,6 +2497,7 @@ class Query(object):
             'limit':self._limit,
             'offset':self._offset,
             'distinct':self._distinct,
+            'prefixes':self._prefixes,
             'group_by':self._group_by or None,
             'having':self._having
         }
diff --git a/test/orm/test_query.py b/test/orm/test_query.py
index 451d61a678..bcc9768165 100644
--- a/test/orm/test_query.py
+++ b/test/orm/test_query.py
@@ -1603,6 +1603,43 @@ class DistinctTest(QueryTest):
         self.assert_sql_count(testing.db, go, 1)
 
 
+class PrefixWithTest(QueryTest, AssertsCompiledSQL):
+
+    def test_one_prefix(self):
+        User = self.classes.User
+        sess = create_session()
+        query = sess.query(User.name)\
+            .prefix_with('PREFIX_1')
+        expected = "SELECT PREFIX_1 "\
+            "users.name AS users_name FROM users"
+        self.assert_compile(query, expected,
+            dialect=default.DefaultDialect()
+        )
+
+    def test_many_prefixes(self):
+        User = self.classes.User
+        sess = create_session()
+        query = sess.query(User.name)\
+            .prefix_with('PREFIX_1', 'PREFIX_2')
+        expected = "SELECT PREFIX_1 PREFIX_2 "\
+            "users.name AS users_name FROM users"
+        self.assert_compile(query, expected,
+            dialect=default.DefaultDialect()
+        )
+
+    def test_chained_prefixes(self):
+        User = self.classes.User
+        sess = create_session()
+        query = sess.query(User.name)\
+            .prefix_with('PREFIX_1')\
+            .prefix_with('PREFIX_2', 'PREFIX_3')
+        expected = "SELECT PREFIX_1 PREFIX_2 PREFIX_3 "\
+            "users.name AS users_name FROM users"
+        self.assert_compile(query, expected,
+            dialect=default.DefaultDialect()
+        )
+
+
 class YieldTest(QueryTest):
     def test_basic(self):
         User = self.classes.User