Author: kkubasik Date: 2009-07-22 08:17:41 -0500 (Wed, 22 Jul 2009) New Revision: 11295
Modified: django/branches/soc2009/test-improvements/ django/branches/soc2009/test-improvements/django/db/backends/oracle/base.py django/branches/soc2009/test-improvements/docs/internals/committers.txt django/branches/soc2009/test-improvements/tests/regressiontests/backends/tests.py Log: [gsoc2009-testing] Merging from upstream Property changes on: django/branches/soc2009/test-improvements ___________________________________________________________________ Name: svk:merge - 23ef3597-c209-482b-90c0-ea6045f15f7f:/local/django-gsoc:11117 23ef3597-c209-482b-90c0-ea6045f15f7f:/local/django/trunk:10927 bcc190cf-cafb-0310-a4f2-bffc1f526a37:/django/trunk:11277 + 23ef3597-c209-482b-90c0-ea6045f15f7f:/local/django-gsoc:11124 23ef3597-c209-482b-90c0-ea6045f15f7f:/local/django/trunk:10927 bcc190cf-cafb-0310-a4f2-bffc1f526a37:/django/trunk:11285 Modified: django/branches/soc2009/test-improvements/django/db/backends/oracle/base.py =================================================================== --- django/branches/soc2009/test-improvements/django/db/backends/oracle/base.py 2009-07-22 13:12:26 UTC (rev 11294) +++ django/branches/soc2009/test-improvements/django/db/backends/oracle/base.py 2009-07-22 13:17:41 UTC (rev 11295) @@ -345,7 +345,7 @@ """ Wrapper object for formatting parameters for Oracle. If the string representation of the value is large enough (greater than 4000 characters) - the input size needs to be set as NCLOB. Alternatively, if the parameter + the input size needs to be set as CLOB. Alternatively, if the parameter has an `input_size` attribute, then the value of the `input_size` attribute will be used instead. Otherwise, no input size will be set for the parameter when executing the query. @@ -360,8 +360,8 @@ # If parameter has `input_size` attribute, use that. self.input_size = param.input_size elif isinstance(param, basestring) and len(param) > 4000: - # Mark any string param greater than 4000 characters as an NCLOB. - self.input_size = Database.NCLOB + # Mark any string param greater than 4000 characters as a CLOB. + self.input_size = Database.CLOB else: self.input_size = None Modified: django/branches/soc2009/test-improvements/docs/internals/committers.txt =================================================================== --- django/branches/soc2009/test-improvements/docs/internals/committers.txt 2009-07-22 13:12:26 UTC (rev 11294) +++ django/branches/soc2009/test-improvements/docs/internals/committers.txt 2009-07-22 13:17:41 UTC (rev 11295) @@ -149,11 +149,21 @@ .. _brian rosner: http://oebfare.com/ .. _this week in django: http://thisweekindjango.com/ -Gary Wilson - In early 2007, Gary started contributing a lot of cleanup fixes and fixing - broken windows. He's continued to do that necessary tidying up work - throughout the code base since then. +`Gary Wilson`_ + Gary starting contributing patches to Django in 2006 while developing Web + applications for `The University of Texas`_ (UT). Since, he has made + contributions to the e-mail and forms systems, as well as many other + improvements and code cleanups throughout the code base. + Gary is currently a developer and software engineering graduate student at + UT, where his dedication to spreading the ways of Python and Django never + ceases. + + Gary lives in Austin, Texas, USA. + +.. _Gary Wilson: http://gdub.wordpress.com/ +.. _The University of Texas: http://www.utexas.edu/ + Justin Bronn Justin Bronn is a computer scientist and attorney specializing in legal topics related to intellectual property and spatial law. Modified: django/branches/soc2009/test-improvements/tests/regressiontests/backends/tests.py =================================================================== --- django/branches/soc2009/test-improvements/tests/regressiontests/backends/tests.py 2009-07-22 13:12:26 UTC (rev 11294) +++ django/branches/soc2009/test-improvements/tests/regressiontests/backends/tests.py 2009-07-22 13:17:41 UTC (rev 11295) @@ -17,7 +17,22 @@ return True else: return True + +class LongString(unittest.TestCase): + def test_long_string(self): + # If the backend is Oracle, test that we can save a text longer + # than 4000 chars and read it properly + if settings.DATABASE_ENGINE == 'oracle': + c = connection.cursor() + c.execute('CREATE TABLE ltext ("TEXT" NCLOB)') + long_str = ''.join([unicode(x) for x in xrange(4000)]) + c.execute('INSERT INTO ltext VALUES (%s)',[long_str]) + c.execute('SELECT text FROM ltext') + row = c.fetchone() + c.execute('DROP TABLE ltext') + self.assertEquals(long_str, row[0].read()) + def connection_created_test(sender, **kwargs): print 'connection_created signal' --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Django updates" group. To post to this group, send email to django-updates@googlegroups.com To unsubscribe from this group, send email to django-updates+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/django-updates?hl=en -~----------~----~----~----~------~----~------~--~---