jarshwah

diff --git a/tests/foreign_object/models.py b/tests/foreign_object/models.py
index e774421..1c163f5 100644
--- a/tests/foreign_object/models.py
+++ b/tests/foreign_object/models.py
@@ -278,7 +278,7 @@ class BrokenContainsRelation(StartsWithRelation):

 @python_2_unicode_compatible
 class SlugPage(models.Model):
-    slug = models.TextField()
+    slug = models.CharField(max_length=20)

jarshwah

diff --git a/django/db/backends/oracle/compiler.py b/django/db/backends/oracle/compiler.py
index cfc8a08..12d9ad6 100644
--- a/django/db/backends/oracle/compiler.py
+++ b/django/db/backends/oracle/compiler.py
@@ -20,12 +20,12 @@ class SQLCompiler(compiler.SQLCompiler):
         do_offset = with_limits and (self.query.high_mark is not None
                                      or self.query.low_mark)
         if not do_offset:
-            sql, params = super(SQLCompiler, self).as_sql(with_limits=False,
-                    with_col_aliases=with_col_aliases)

jarshwah

-- queries.tests.Queries1Tests.test_ticket2496
SELECT * FROM (
 SELECT "_SUB".*,
 ROWNUM AS "_RN" FROM (SELECT "QUERIES_ITEM"."ID",
 "QUERIES_ITEM"."NAME",
 "QUERIES_ITEM"."CREATED",
 "QUERIES_ITEM"."MODIFIED",
 "QUERIES_ITEM"."CREATOR_ID",
 "QUERIES_ITEM"."NOTE_ID",
 "QUERIES_AUTHOR"."ID",

jarshwah

diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py
index 64b5ba0..8b69406 100644
--- a/django/db/models/expressions.py
+++ b/django/db/models/expressions.py
@@ -487,11 +487,7 @@ class Value(ExpressionNode):
     def as_sql(self, compiler, connection):
         val = self.value
         if self._output_field_or_none is not None:
-            from django.db.models.sql.compiler import SQLUpdateCompiler
-            if isinstance(compiler, SQLUpdateCompiler):

jarshwah

sudo apt-get update
sudo apt-get install gcc libffi-dev vim
sudo apt-get install python3.3 python3.3-dev python3.3-minimal
workon py2.7
pip install -r /home/vagrant/.hosthome/Development/django/tests/requirements/py2.txt
deactivate
rm /home/vagrant/.virtualenvs/py3.3/bin/python
cd /home/vagrant/.virtualenvs/
mkvirtualenv py3.3 --python=`which python3.3`
workon py3.3

jarshwah

diff --git django/db/models/functions.py django/db/models/functions.py
index c3dea1f..30046ea 100644
--- django/db/models/functions.py
+++ django/db/models/functions.py
@@ -2,7 +2,7 @@
 Classes that represent database functions.
 """
 from django.db.models.expressions import Func, Value
-from django.db.models import IntegerField
+from django.db.models import IntegerField, Transform

jarshwah

import base64
import hashlib
import hmac
import requests
import time

from django.contrib.auth import get_user_model
from django.conf import settings
from django.core.cache import cache
from django.utils.http import unquote

jarshwah

(django)[vagrant@peppermint django]$ ./runoracletests.py expressions
Testing against Django installed in '/django/django'
Creating test database for alias 'default'...
Creating test user...
Creating test database for alias 'other'...
Creating test user...
..s.................s..................
----------------------------------------------------------------------
Ran 39 tests in 386.525s

jarshwah

def g(letters=None):
    if letters: return 'gal'
    goal = ['go']
    def o(letters=None):
        assert letters is None or letters == 'al'
        if letters:
            goal.append(letters)
            return ''.join(goal)
        goal.append('o')
        return o

jarshwah

field=None	value=1L
	field=<django.db.models.fields.AutoField: id>	value=u'159059725'
	field=<django.db.models.fields.CharField: isbn>	value=u'The Definitive Guide to Django: Web Development Done Right'
	field=<django.db.models.fields.CharField: name>	value=447L
	field=<django.db.models.fields.IntegerField: pages>	value=4.5
	field=<django.db.models.fields.FloatField: rating>	value=Decimal('30.00')
	field=<django.db.models.fields.DecimalField: price>	value=1L
	field=<django.db.models.fields.related.ForeignKey: contact>	value=1L
	field=<django.db.models.fields.related.ForeignKey: publisher>	value=datetime.date(2007, 12, 6)
	field=<django.db.models.fields.DateField: pubdate>	value=1L