Skip to content

Span OneToOneField relationship using double underscores. #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 7, 2015
Merged

Span OneToOneField relationship using double underscores. #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion django_pandas/io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def to_fields(qs, fieldnames):
model = qs.model
for fieldname_part in fieldname.split('__'):
field = model._meta.get_field(fieldname_part)
if field.get_internal_type() == 'ForeignKey':
if field.get_internal_type() in ('ForeignKey', 'OneToOneField'):
model = field.rel.to
yield field

Expand Down
14 changes: 12 additions & 2 deletions django_pandas/tests/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,21 +122,31 @@ def __str__(self):
return "{0}-{1}".format(self.isin, self.symbol)


@python_2_unicode_compatible
class TradeLogNote(models.Model):
note = models.TextField()

def __str__(self):
return self.note


@python_2_unicode_compatible
class TradeLog(models.Model):
trader = models.ForeignKey(Trader)
symbol = models.ForeignKey(Security, null=True)
log_datetime = models.DateTimeField()
price = models.FloatField()
volume = models.IntegerField()
note = models.OneToOneField(TradeLogNote)

objects = DataFrameManager()

def __str__(self):
return "{0}-{1}-{2}-{3}-{4}".format(
return "{0}-{1}-{2}-{3}-{4}-{5}".format(
self.trader,
self.symbol,
self.log_datetime,
self.price,
self.volume
self.volume,
self.note
)
28 changes: 18 additions & 10 deletions django_pandas/tests/test_io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from django.db.models import Sum
import pandas as pd
import numpy as np
from .models import MyModel, Trader, Security, TradeLog, MyModelChoice
from .models import MyModel, Trader, Security, TradeLog, TradeLogNote, MyModelChoice
from django_pandas.io import read_frame


Expand Down Expand Up @@ -85,28 +85,36 @@ def setUp(self):
zyz = Security.objects.create(symbol='ZYZ', isin='999907')
TradeLog.objects.create(trader=bob, symbol=None,
log_datetime='2013-01-01T09:30:00',
price=30, volume=300)
price=30, volume=300,
note=TradeLogNote.objects.create(note='aaa'))
TradeLog.objects.create(trader=bob, symbol=None,
log_datetime='2013-01-01T10:00:00',
price=30, volume=300)
price=30, volume=300,
note=TradeLogNote.objects.create(note='aab'))
TradeLog.objects.create(trader=bob, symbol=abc,
log_datetime='2013-01-01T10:30:00',
price=30, volume=300)
price=30, volume=300,
note=TradeLogNote.objects.create(note='aac'))
TradeLog.objects.create(trader=bob, symbol=abc,
log_datetime='2013-01-01T11:00:00',
price=30, volume=300)
price=30, volume=300,
note=TradeLogNote.objects.create(note='aad'))
TradeLog.objects.create(trader=fish, symbol=zyz,
log_datetime='2013-01-01T09:30:00',
price=30, volume=300)
price=30, volume=300,
note=TradeLogNote.objects.create(note='aae'))
TradeLog.objects.create(trader=fish, symbol=zyz,
log_datetime='2013-01-01T10:00:00',
price=30, volume=300)
price=30, volume=300,
note=TradeLogNote.objects.create(note='aaf'))
TradeLog.objects.create(trader=fish, symbol=zyz,
log_datetime='2013-01-01T10:30:00',
price=30, volume=300)
price=30, volume=300,
note=TradeLogNote.objects.create(note='aag'))
TradeLog.objects.create(trader=fish, symbol=zyz,
log_datetime='2013-01-01T11:00:00',
price=30, volume=300)
price=30, volume=300,
note=TradeLogNote.objects.create(note='aah'))

def test_verbose(self):
qs = TradeLog.objects.all()
Expand All @@ -124,7 +132,7 @@ def test_verbose(self):
def test_related_cols(self):
qs = TradeLog.objects.all()
cols = ['log_datetime', 'symbol', 'symbol__isin', 'trader__name',
'price', 'volume']
'price', 'volume', 'note__note']
df = read_frame(qs, cols, verbose=False)

self.assertEqual(df.shape, (qs.count(), len(cols)))
Expand Down