[SQL-CVS] SQLObject development repository branch master updated. 3.0.0a2-20-g814209b

[Oleg B. <no...@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  814209b369b60280d008f997b2b1960285b935ac (commit)
       via  28dea0fe7451d10ddc9ba74e0d24f5fd450f3413 (commit)
       via  42266faeb01d6cdb772d9b258e09dcf503d4b874 (commit)
      from  573c8075d9a0025a7cf34b03bd146dd4384c35eb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/814209b369b60280d008f997b2b1960285b935ac

commit 814209b369b60280d008f997b2b1960285b935ac
Author: Oleg Broytman <ph...@ph...>
Date:   Sat May 7 13:42:40 2016 +0300

    Adapt test_CONCAT to Py3
    
    MySQL returns bytes while Pg and SQLite return strings; decode bytes
    to a string.

diff --git a/sqlobject/tests/test_sqlbuilder.py b/sqlobject/tests/test_sqlbuilder.py
index e99f9ef..d494453 100644
--- a/sqlobject/tests/test_sqlbuilder.py
+++ b/sqlobject/tests/test_sqlbuilder.py
@@ -1,4 +1,5 @@
 from sqlobject import *
+from sqlobject.compat import PY2
 from sqlobject.sqlbuilder import *
 from sqlobject.tests.dbtest import *
 
@@ -104,4 +105,6 @@ def test_CONCAT():
     connection = getConnection()
     rows = connection.queryAll(connection.sqlrepr(select))
     result = rows[0][0]
+    if not PY2 and not isinstance(result, str):
+        result = result.decode('ascii')
     assert result == "test-suffix"

http://sourceforge.net/p/sqlobject/sqlobject/ci/28dea0fe7451d10ddc9ba74e0d24f5fd450f3413

commit 28dea0fe7451d10ddc9ba74e0d24f5fd450f3413
Merge: 573c807 42266fa
Author: Oleg Broytman <ph...@ph...>
Date:   Sat May 7 13:38:04 2016 +0300

    Merge branch '2.2'

diff --cc sqlobject/tests/test_sqlbuilder.py
index e1dbc34,5a112ae..e99f9ef
--- a/sqlobject/tests/test_sqlbuilder.py
+++ b/sqlobject/tests/test_sqlbuilder.py
@@@ -87,11 -74,12 +87,13 @@@ def test_str_or_sqlrepr()
      assert sqlrepr(delete, 'sqlite') == \
          "DELETE FROM employees"
  
 +
  def test_CONCAT():
+     setupClass(TestSQLBuilder)
+     TestSQLBuilder(name='test', value=42)
+ 
      assert sqlrepr(CONCAT('a', 'b'), 'mysql') == "CONCAT('a', 'b')"
      assert sqlrepr(CONCAT('a', 'b'), 'sqlite') == "'a' || 'b'"
-     setupClass(TestSQLBuilder)
      assert sqlrepr(CONCAT('prefix', TestSQLBuilder.q.name), 'mysql') == \
          "CONCAT('prefix', test_sql_builder.name)"
      assert sqlrepr(CONCAT('prefix', TestSQLBuilder.q.name), 'sqlite') == \

-----------------------------------------------------------------------

Summary of changes:
 sqlobject/tests/test_sqlbuilder.py |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
SQLObject development repository