Attachments to Doctrine Jira Issue DDC-1239 - https://github.com/doctrine/doctrine2/issues/1848

11021_Clinic.php

<?php
namespace Entity;

/** 
 * @Entity(repositoryClass="VetLogic\ORM\EntityRepository")
 * @Table(name="clinic") 
 */
class Clinic extends \VetLogic\Entity
{
	/**
	 * @Id
	 * @Column(type="smallint")
	 */
	protected $dsid;

	/** 
	 * @Id
	 * @Column(type="integer") 
	 */
	protected $rid;

	/** @Column(type="integer",nullable=true) */
	protected $colorRid;

	/** @Column(type="integer",nullable=true) */
	protected $addressId;

	/** @Column(type="integer",nullable=true) */
	protected $reminderEmailLayoutId;

	/** @Column(type="integer",nullable=true) */
	protected $reminderSmsLayoutId;

	/** @Column(type="integer",nullable=true) */
	protected $reminderVoiceLayoutId;

	/** @Column(type="string",length=100) */
	protected $name;

	/** @Column(type="string",length=15) */
	protected $phoneNumber;

	/** @Column(type="string",length=15,nullable=true) */
	protected $faxNumber;

	/** @Column(type="string",length=100,nullable=true) */
	protected $email;

	/** @Column(type="boolean") */
	protected $birthdaysEnabled;

	/** @Column(type="boolean") */
	protected $newslettersEnabled;

	/** @Column(type="boolean") */
	protected $remindersEnabled;

	/** @Column(type="boolean") */
	protected $sendzaEnabled;

	/** @Column(type="string",length=36,nullable=true) */
	protected $sendzaId;

	/**
	 * @ManyToOne(targetEntity="Entity\Message\Layout")
	 * @JoinColumn(name="reminderEmailLayoutId")
	 */
	protected $emailLayout;

	/**
	 * @ManyToOne(targetEntity="Entity\Message\Layout")
	 * @JoinColumn(name="reminderSmsLayoutId")
	 */
	protected $smsLayout;

	/**
	 * @ManyToOne(targetEntity="Entity\Message\Layout")
	 * @JoinColumn(name="reminderVoiceLayoutId")
	 */
	protected $voiceLayout;

	/**
	 * @ManyToOne(targetEntity="Entity\DataSource",inversedBy="clinics")
	 * @JoinColumn(name="dsid")
	 */
	protected $dataSource;

	/**
	 * (non-PHPdoc)
	 * @see VetLogic.Entity::init()
	 */
	public function init() {
		$this->birthdaysEnabled = 0;
		$this->newslettersEnabled = 0;
		$this->remindersEnabled = 0;
		$this->sendzaEnabled = 0;
	}
}

11022_Consumer.php

<?php
namespace Entity\OAuth;

/** 
 * @Entity(repositoryClass="VetLogic\ORM\EntityRepository")
 * @Table(name="oauth_consumer") 
 */
class Consumer extends \VetLogic\Entity
{
	/** 
	 * @Id @Column(type="integer")
	 * @GeneratedValue
	 */
	protected $id;

	/** @Column(type="smallint",nullable=true) */
	protected $dsid;

	/** @Column(type="integer",nullable=true) */
	protected $rid;

	/** @Column(type="integer") */
	protected $groupId;

	/** @Column(type="smallint",nullable=true) */
	protected $companyId;

	/** @Column(type="integer",nullable=true) */
	protected $userId;

	/** @Column(name="`key`",type="string") */
	protected $key;

	/** @Column(type="string") */
	protected $secret;

	/**
	 * @ManyToOne(targetEntity="Entity\Group",fetch="EAGER")
	 * @JoinColumn(name="groupId",nullable=false)
	 */
	protected $group;

	/**
	 * @ManyToOne(targetEntity="Entity\Company",fetch="EAGER")
	 * @JoinColumn(name="companyId",nullable=false)
	 */
	protected $company;

	/**
	 * @ManyToOne(targetEntity="Entity\Clinic",fetch="EAGER")
	 * @JoinColumns({
	 * 		@JoinColumn(name="dsid",referencedColumnName="dsid"),
	 * 		@JoinColumn(name="rid",referencedColumnName="rid")
	 * })
	 */
	protected $clinic;

	/**
	 * @ManyToOne(targetEntity="Entity\User",fetch="EAGER")
	 * @JoinColumn(name="userId",nullable=false)
	 */
	protected $user;

	/**
	 * @OneToMany(targetEntity="Entity\OAuth\Consumer\Nonce", mappedBy="consumer", fetch="EAGER")
	 */
	protected $nonces;
}