Fixes for Django 1.6

[jmacul2]

Since Django 1.6 changed WhereNode a bit, I've added changes to make 1.6 work while preserving backwards compatibility. This should and needs to be reviewed. There might be a better way to handle this.

[adamcik]

https://travis-ci.org/jimfunk/django-postgresql-netfields/jobs/8943029#L55 seems there is an indentation error in your code.

[jmacul2]

Sorry about that. Should be working now.

[rouge8]

Now that Django 1.6 is out, any chance of this getting merged?

[jmacul2]

I added commit 673de18jmacul2@673de18
to
the pull 2 days later which should of fixed the bad indent. Are you
building against that?

On Fri, Jul 12, 2013 at 2:58 PM, Thomas Adamcik notifications@github.comwrote:

https://travis-ci.org/jimfunk/django-postgresql-netfields/jobs/8943029#L55seems there is an indentation error in your code.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/17#issuecomment-20903820
.

[rouge8]

I actually get two errors on 673de18:

======================================================================
FAIL: test_iregex_lookup (netfields.tests.TestMacAddressField)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/rouge8/tmp/django-postgresql-netfields/netfields/tests.py", line 363, in test_iregex_lookup
    self.select + 'WHERE "table"."field" ~* %s ')
  File "/Users/rouge8/tmp/django-postgresql-netfields/netfields/tests.py", line 18, in assertSqlEquals
    self.assertEqual(qs.query.get_compiler(qs.db).as_sql()[0], sql)
AssertionError: u'SELECT "mac"."id", "mac"."field" FROM "mac" WHERE "mac"."field"::text ~* %s ' != 'SELECT "mac"."id", "mac"."field" FROM "mac" WHERE "mac"."field" ~* %s '

======================================================================
FAIL: test_regex_lookup (netfields.tests.TestMacAddressField)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/rouge8/tmp/django-postgresql-netfields/netfields/tests.py", line 359, in test_regex_lookup
    self.select + 'WHERE "table"."field" ~ %s ')
  File "/Users/rouge8/tmp/django-postgresql-netfields/netfields/tests.py", line 18, in assertSqlEquals
    self.assertEqual(qs.query.get_compiler(qs.db).as_sql()[0], sql)
AssertionError: u'SELECT "mac"."id", "mac"."field" FROM "mac" WHERE "mac"."field"::text ~ %s ' != 'SELECT "mac"."id", "mac"."field" FROM "mac" WHERE "mac"."field" ~ %s '

----------------------------------------------------------------------
Ran 229 tests in 1.113s

FAILED (failures=2)

[jmacul2]

So the two test errors are actually incorrect postgres SQL. You cannot do a regex search on macaddr without first converting it to text. This appeared to always have been broken until they patched it here: http://goo.gl/Z1oLSN. I updated the tests just to get them to work on all versions, but you might want to change it differently.

[darkpixel]

@jmacul2's fix works for me. Any chance of getting it committed?