--- a/.hgtags Thu Sep 09 10:10:19 2010 +0200
+++ b/.hgtags Mon Sep 13 14:47:09 2010 +0200
@@ -56,3 +56,5 @@
aca033de456a6b526045f9be0dbdb770e67912ab rql-debian-version-0.26.3-1
bcf24f8a29c07146220816565a132ba148cdf82a rql-version-0.26.4
88b739e85c615fc41a964f39e853fe77aaf3f207 rql-debian-version-0.26.4-1
+7a1df18b3a3ed41aa49d4baf10246a8e2e65a7d6 rql-version-0.26.6
+23bd1f36ec77f30cd525327d408ef6836f88eb24 rql-debian-version-0.26.6-1
--- a/ChangeLog Thu Sep 09 10:10:19 2010 +0200
+++ b/ChangeLog Mon Sep 13 14:47:09 2010 +0200
@@ -1,18 +1,23 @@
ChangeLog for RQL
=================
---
+2010-09-10 -- 0.26.6
* enhance bad rql query detection with ordered distinct (can't use distinct
if an attribute is selected and we sort on another attribute)
- * add constraint package to dependencies so we've fallback opportunity if
- gecode is not installed
-
* fix subquery_selection_index responsability mess-up: it wasn't doing what
it should have done (see cw.rset related_entity implementation)
* consider subquery aliases in Select.clean_solutions
+ * add constraint package to setuptools dependencies so we've fallback
+ opportunity if gecode is not installed
+
+ * fix setuptools dependency on yapps by forcing install of our custom
+ package, so it don't try to install pypi's one which doesn't work well
+ with both pip and easy_install
+
+
2010-08-02 -- 0.26.5
* fix solutions computation crash with some query using sub-queries (closes #37423)
--- a/__pkginfo__.py Thu Sep 09 10:10:19 2010 +0200
+++ b/__pkginfo__.py Mon Sep 13 14:47:09 2010 +0200
@@ -20,7 +20,7 @@
__docformat__ = "restructuredtext en"
modname = "rql"
-numversion = (0, 26, 5)
+numversion = (0, 26, 6)
version = '.'.join(str(num) for num in numversion)
license = 'LGPL'
@@ -69,8 +69,8 @@
else:
ext_modules = [ Extension('rql_solve',
['gecode_solver.cpp'],
- libraries=['GecodeInt-3-3-1-r-x86',
- 'GecodeKernel-3-3-1-r-x86',
+ libraries=['GecodeInt-3-3-1-r-x86',
+ 'GecodeKernel-3-3-1-r-x86',
'GecodeSearch-3-3-1-r-x86',
'GecodeSupport-3-3-1-r-x86',
],
@@ -82,11 +82,11 @@
install_requires = [
'logilab-common >= 0.47.0',
'logilab-database',
- 'yapps2 >= 2.1.1',
+ 'yapps == 2.1.1', # XXX to ensure we don't use the broken pypi version
'constraint', # fallback if the gecode compiled module is missing
]
# links to download yapps2 package that is not (yet) registered in pypi
dependency_links = [
- "http://ftp.logilab.org/pub/yapps/yapps2-2.1.1.zip#egg=yapps2-2.1.1",
+ "http://ftp.logilab.org/pub/yapps/yapps2-2.1.1.zip#egg=yapps-2.1.1",
]
--- a/debian/changelog Thu Sep 09 10:10:19 2010 +0200
+++ b/debian/changelog Mon Sep 13 14:47:09 2010 +0200
@@ -1,3 +1,9 @@
+rql (0.26.6-1) unstable; urgency=low
+
+ * new upstream release
+
+ -- Sylvain Thénault <sylvain.thenault@logilab.fr> Fri, 10 Sep 2010 11:09:22 +0200
+
rql (0.26.5-1) unstable; urgency=low
* new upstream release
--- a/test/unittest_parser.py Thu Sep 09 10:10:19 2010 +0200
+++ b/test/unittest_parser.py Mon Sep 13 14:47:09 2010 +0200
@@ -63,6 +63,7 @@
'Any X WHERE X eid 53;',
'Any X WHERE X eid -53;',
"Document X WHERE X occurence_of F, F class C, C name 'Bande dessinée', X owned_by U, U login 'syt', X available true;",
+ u"Document X WHERE X occurence_of F, F class C, C name 'Bande dessinée', X owned_by U, U login 'syt', X available true;",
"Personne P WHERE P travaille_pour S, S nom 'Eurocopter', P interesse_par T, T nom 'formation';",
"Note N WHERE N ecrit_le D, D day > (today -10), N ecrit_par P, P nom 'jphc' or P nom 'ocy';",
"Personne P WHERE (P interesse_par T, T nom 'formation') or (P ville 'Paris');",
@@ -168,6 +169,14 @@
print string, ex
raise
+ def test_unicode_constant(self):
+ tree = self.parse(u"Any X WHERE X name 'Ångström';")
+ base = tree.children[0].where
+ comparison = base.children[1]
+ self.failUnless(isinstance(comparison, nodes.Comparison))
+ rhs = comparison.children[0]
+ self.assertEquals(type(rhs.value), unicode)
+
def test_precedence_1(self):
tree = self.parse("Any X WHERE X firstname 'lulu' AND X name 'toto' OR X name 'tutu';")
base = tree.children[0].where