Tweaking the peewee code for generating the DOIDatasets object to use…

… a proper primary key.

updating the psycopg2 package in requirements to reflect its new naming (psycopg2-binary)

Fixes pacifica#133

metadata/orm/base.py

@@ -154,7 +154,6 @@ def _build_object(self, attr):
  @staticmethod
  def get_append_item(obj_ref, fk_item_name, fk_obj_list):
  """Generate the proper item to append to the newly built object."""
- # pylint: disable=protected-access
  if 'key' in fk_obj_list.values() and 'value' in fk_obj_list.values():
  append_item = {
  'key_id': obj_ref.__data__['key'],
@@ -172,7 +171,7 @@ def _generate_fk_obj_list(self, obj_ref):
  if len(valid_fk_obj_list) == 1:
  fk_item_name = fk_obj_list[valid_fk_obj_list.pop()]
  else:
- fk_item_name = 'id'
+ fk_item_name = obj_ref.__class__._meta.__dict__['primary_key'].__dict__['column_name']
  return fk_item_name, fk_obj_list
 
  def from_hash(self, obj):

metadata/orm/doi_release.py

@@ -24,7 +24,7 @@ class DOIRelease(CherryPyAPI):
  """
 
  doi = ForeignKeyField(
- DOIDataSets, related_name='doi_releases', to_field='doi')
+ DOIDataSets, related_name='doi_entries', to_field='doi')
  release = ForeignKeyField(TransactionRelease, related_name='doi_releases')
 
  # pylint: disable=too-few-public-methods

metadata/orm/doidatasets.py

@@ -23,7 +23,7 @@ class DOIDataSets(CherryPyAPI):
  +-------------------+-------------------------------------+
  """
 
- doi = CharField(unique=True)
+ doi = CharField(primary_key=True)
  name = CharField(default='')
  encoding = CharField(default='UTF8')
  creator = ForeignKeyField(Users, related_name='dois_created')

requirements-dev.txt

@@ -7,7 +7,7 @@ mock
 nose
 peewee>2
 pep257
-psycopg2
+psycopg2-binary
 pylint
 pytest
 python-dateutil

requirements.txt

@@ -1,7 +1,7 @@
 cherrypy
 elasticsearch
 peewee>2
-psycopg2
+psycopg2-binary
 python-dateutil
 requests
 six