X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=propel%2Fschema.xml;h=2d6a609892a45fe1e769285021ad0a0b8c107b18;hb=HEAD;hp=b6a4804bdc5c18ccc7e3e0d92f214a77bb20c34e;hpb=a034b9e4d45513c3bd147e45fd969c14162fb13d;p=readifood.git

diff --git a/propel/schema.xml b/propel/schema.xml
index b6a4804..2d6a609 100644
--- a/propel/schema.xml
+++ b/propel/schema.xml
@@ -52,6 +52,7 @@
       <parameter name="Charset" value="utf8"/>
     </vendor>
     <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true"/>
+    <column name="added" type="date" required="true"/>
     <column name="address_id" type="integer" required="true"/>
     <column name="forename" type="varchar" size="64" required="true"/>
     <column name="middle" type="varchar" size="128" required="true"/>
@@ -61,6 +62,7 @@
     <column name="telephone1" type="varchar" size="32" required="true"/>
     <column name="telephone2" type="varchar" size="32" required="true"/>
     <column name="email" type="varchar" size="64" required="true"/>
+    <column name="parcel" type="integer"/>
     <column name="notes" type="longvarchar" lazyLoad="true"/>
     <foreign-key foreignTable="Address" phpName="Address" refPhpName="Contact">
       <reference local="address_id" foreign="id"/>
@@ -130,7 +132,8 @@
     <column name="requester_id" type="integer" required="true"/>
     <column name="beneficiary_id" type="integer" required="true"/>
     <column name="hub_id" type="integer" required="false"/>
-    <column name="quantity" type="integer" required="true"/>
+    <column name="parcel" type="integer" required="true"/>
+    <column name="notes" type="longvarchar" lazyLoad="true"/>
     <foreign-key foreignTable="Contact" phpName="Requester" refPhpName="Requester">
       <reference local="requester_id" foreign="id"/>
     </foreign-key>
@@ -158,10 +161,56 @@
       <reference local="order_id" foreign="id"/>
     </foreign-key>
     <foreign-key foreignTable="User" phpName="User" refPhpName="OrderState">
-      <reference local="user_id" foreign="id"/>
+      <reference local="user_id" foreign="contact_id"/>
     </foreign-key>
     <foreign-key foreignTable="Contact" phpName="Driver" refPhpName="OrderState">
       <reference local="driver_id" foreign="id"/>
     </foreign-key>
   </table>
+
+  <!-- Session state -->
+  <table name="Session" phpName="Session" baseClass="ReadifoodObject">
+    <vendor type="mysql">
+      <parameter name="Engine" value="InnoDB"/>
+      <parameter name="Charset" value="utf8"/>
+    </vendor>
+    <column name="id" type="varchar" primaryKey="true" required="true"/>
+    <column name="data" type="longvarchar" required="true"/>
+    <column name="timestamp" type="integer" required="true"/>
+  </table>
+
+  <!-- Offer -->
+  <table name="Offer" phpName="Offer" baseClass="ReadifoodObject">
+    <vendor type="mysql">
+      <parameter name="Engine" value="InnoDB"/>
+      <parameter name="Charset" value="utf8"/>
+    </vendor>
+    <column name="id" type="integer" primaryKey="true" required="true" autoIncrement="true"/>
+    <column name="description" type="varchar" size="256" required="true"/>
+    <column name="valid_from" type="date"/>
+    <column name="valid_to" type="date"/>
+  </table>
+
+  <!-- Offer state -->
+  <table name="OfferState" phpName="OfferState" baseClass="ReadifoodObject">
+    <vendor type="mysql">
+      <parameter name="Engine" value="InnoDB"/>
+      <parameter name="Charset" value="utf8"/>
+    </vendor>
+    <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true"/>
+    <column name="updated" type="timestamp" required="true"/>
+    <column name="offer_id" type="integer" required="true"/>
+    <column name="user_id" type="integer" required="true"/>
+    <column name="contact_id" type="integer" required="true"/>
+    <column name="state" type="integer" required="true"/>
+    <foreign-key foreignTable="Offer" phpName="Offer" refPhpName="OfferState">
+      <reference local="offer_id" foreign="id"/>
+    </foreign-key>
+    <foreign-key foreignTable="User" phpName="User" refPhpName="OfferState">
+      <reference local="user_id" foreign="contact_id"/>
+    </foreign-key>
+    <foreign-key foreignTable="Contact" phpName="Contact" refPhpName="OfferState">
+      <reference local="contact_id" foreign="id"/>
+    </foreign-key>
+  </table>
 </database>