diff --git a/schemas/adl-0.dtd b/schemas/adl-0.dtd
index 51224ef..0a0f30d 100755
--- a/schemas/adl-0.dtd
+++ b/schemas/adl-0.dtd
@@ -13,7 +13,7 @@
     <!--  ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::  -->
     
     <!--
-        $Revision: 1.6 $
+        $Revision: 1.7 $
  	    -->
 
 <!--  ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::  -->
@@ -82,8 +82,15 @@
 					    char(1)		  java.sql.Types.CHAR
 	text:			  text or		  java.sql.Types.LONGVARCHAR 
 					    memo		    java.sql.Types.CLOB
+              
+  Also, a hack, which may not belong here:
+              
+  serial:     An integer whose value is automatically assigned by the database. Given 
+              that Canonical ADL requires that every key must be specified, we
+              need a way of distinguishing those which are system generated from
+              those which aren't. This may not be the right way to do it!
 -->
-<!ENTITY % SimpleDataTypes "%DefinableDataTypes;|boolean|text" >
+<!ENTITY % SimpleDataTypes "%DefinableDataTypes;|boolean|text|serial" >
 
 <!-- 
 	data types which are more complex than SimpleDataTypes...
diff --git a/transforms01/adl2canonical.xslt b/transforms01/adl2canonical.xslt
index 11ec935..97193fe 100755
--- a/transforms01/adl2canonical.xslt
+++ b/transforms01/adl2canonical.xslt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--
-    C1873 SRU Hospitality
+    Application Description Language framework
     adl2canonical.xsl
     
     (c) 2007 Cygnet Solutions Ltd
@@ -16,17 +16,17 @@
       are generated.
     
     $Author: sb $
-    $Revision: 1.1 $
-    $Date: 2008-02-01 12:43:18 $
+    $Revision: 1.2 $
+    $Date: 2008-02-01 18:25:38 $
   -->
 
 <xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:exsl="http://exslt.org/common"
+  xmlns="http://cygnets.co.uk/schemas/adl-1.2" 
   xmlns:adl="http://cygnets.co.uk/schemas/adl-1.2"
-  xmlns:msxsl="urn:schemas-microsoft-com:xslt">
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="adl">
 
-  <xsl:output encoding="UTF-8" method="text"/>
+  <xsl:output encoding="UTF-8" indent="yes" method="xml" />
 
   <!-- 
   The convention to use for naming auto-generated abstract primary keys. Known values are
@@ -36,13 +36,8 @@
   Name_Id - the name of the auto generated primary key is the name of the entity followed by '_Id'  
   -->
   <xsl:param name="abstract-key-name-convention" select="Id"/>
-  <xsl:param name="locale" select="en-UK"/>
 
   <xsl:template match="adl:application">
-    <xsl:message terminate="no">
-      Abstract key naming convention selected is '<xsl:value-of select="$abstract-key-name-convention"/>'
-      Locale selected is '<xsl:value-of select="$locale"/>'
-    </xsl:message>
     <xsl:copy>
       <xsl:comment>
         ***************************************************************************
@@ -52,7 +47,7 @@
         *	THIS FILE IS AUTOMATICALLY GENERATED AND SHOULD NOT
         *	BE MANUALLY EDITED.
         *
-        *	Generated using adl2canonical.xsl revision <xsl:value-of select="substring('$Revision: 1.1 $', 12)"/>
+        *	Generated using adl2canonical.xsl revision <xsl:value-of select="substring('$Revision: 1.2 $', 12)"/>
         *
         ***************************************************************************
       </xsl:comment>
@@ -61,20 +56,21 @@
   </xsl:template>
 
   <!-- an entity which already has a key tag - just copy it through -->
-  <xsl:template match="adl:entity[key]">
+  <xsl:template match="adl:entity[adl:key]">
     <xsl:comment> 
       entity <xsl:value-of select="@name"/> already has a key - not generating one
     </xsl:comment>
-    <adl:entity>
+    <entity>
       <xsl:apply-templates select="@* | node()"/>
-    </adl:entity>
+    </entity>
   </xsl:template>
 
   <!-- an entity which has a '@natural-key' attribute. 
   Since we've got the key tag, I think this should be disallowed -->
   <xsl:template match="adl:entity[@natural-key]">
-    <xsl:message terminate="no">'@natural-key' is deprecated - use the 'key' sub element instead</xsl:message>
-    <adl:entity>
+    <xsl:message terminate="no">
+      [In entity '<xsl:value-of select="@name"/>']: '@natural-key' is deprecated - use the 'key' sub element instead</xsl:message>
+    <entity>
       <xsl:variable name="nkey" select="@natural-key"/>
       <xsl:apply-templates select="@*"/>
       <!-- children copied through in legal order, to ensure the document remains valid -->
@@ -87,7 +83,7 @@
       <xsl:apply-templates select="adl:property[not(@name=$nkey)] | adl:one-to-many | adl:many-to-many | adl:many-to-one"/>
       <xsl:apply-templates select="adl:permission"/>
       <xsl:apply-templates select="adl:form | adl:page | adl:list"/>
-    </adl:entity>
+    </entity>
   </xsl:template>
 
   <!-- an entity which has no explicit key: auto-generate one -->
@@ -95,13 +91,13 @@
     <xsl:comment>
       entity <xsl:value-of select="@name"/> has no key - generating one
     </xsl:comment>
-    <adl:entity>
+    <entity>
       <!-- copy attributes through -->
       <xsl:apply-templates select="@*"/>
       <!-- children copied through in legal order, to ensure the document remains valid -->
       <xsl:apply-templates select="adl:documentation"/>
       <xsl:apply-templates select="adl:content"/>
-      <adl:key>
+      <key>
         <!-- autogenerate a key element... -->
         <!-- select a name... -->
         <xsl:variable name="key">
@@ -133,23 +129,23 @@
         </xsl:if>
         
         <!-- generate one property, the abstract primary key -->
-        <adl:property type="integer" distinct="system">
+        <property type="serial" distinct="system">
           <xsl:attribute name="name">
             <xsl:value-of select="normalize-space( $key)"/>
           </xsl:attribute>
-        </adl:property>
-      </adl:key>
+        </property>
+      </key>
       <xsl:apply-templates select="adl:property | adl:one-to-many | adl:many-to-many | adl:many-to-one"/>
       <xsl:apply-templates select="adl:permission"/>
       <xsl:apply-templates select="adl:form | adl:page | adl:list"/>
-    </adl:entity>
+    </entity>
   </xsl:template>
 
   <!-- If properties='all', unroll them into a properties='listed' form. 
   We need to do this for lists, pages and forms; there's probably some clever 
   way of doing it all in a oner, but I don't know what that is -->
   <xsl:template match="adl:form[ @properties='all']">
-    <adl:form properties='listed'>
+    <form properties='listed'>
       <!-- copy the name attribute through -->
       <xsl:apply-templates select="@name"/>
       <!-- children copied through in legal order, to ensure the document remains valid -->
@@ -159,14 +155,14 @@
       <xsl:apply-templates select="adl:head|adl:top|adl:foot|adl:field|
                            adl:fieldgroup|adl:auxlist|adl:verb|
                            adl:permission|adl:pragma"/>
-    </adl:form>
+    </form>
   </xsl:template>
 
   <!-- If properties='all', unroll them into a properties='listed' form. 
   We need to do this for lists, pages and forms; there's probably some clever 
   way of doing it all in a oner, but I don't know what that is -->
   <xsl:template match="adl:page[ @properties='all']">
-    <adl:page properties='listed'>
+    <page properties='listed'>
       <!-- copy the name attribute through -->
       <xsl:apply-templates select="@name"/>
       <!-- children copied through in legal order, to ensure the document remains valid -->
@@ -176,14 +172,14 @@
       <xsl:apply-templates select="adl:head|adl:top|adl:foot|adl:field|
                            adl:fieldgroup|adl:auxlist|adl:verb|
                            adl:permission|adl:pragma"/>
-    </adl:page>
+    </page>
   </xsl:template>
 
   <!-- If properties='all', unroll them into a properties='listed' form. 
   We need to do this for lists, pages and forms; there's probably some clever 
   way of doing it all in a oner, but I don't know what that is -->
   <xsl:template match="adl:list[ @properties='all']">
-    <adl:list properties='listed'>
+    <list properties='listed'>
       <!-- copy the name attribute through -->
       <xsl:apply-templates select="@name"/>
       <!-- children copied through in legal order, to ensure the document remains valid -->
@@ -193,13 +189,13 @@
       <xsl:apply-templates select="adl:head|adl:top|adl:foot|adl:field|
                            adl:fieldgroup|adl:auxlist|adl:verb|
                            adl:permission|adl:pragma"/>
-    </adl:list>
+    </list>
   </xsl:template>
 
   <!-- In practice it's likely only to be lists which have properties='user-distinct', 
   but the grammar allows this for pages and forms as well so we'll deal with it -->
   <xsl:template match="adl:form[ @properties='user-distinct']">
-    <adl:form properties='listed'>
+    <form properties='listed'>
       <!-- copy the name attribute through -->
       <xsl:apply-templates select="@name"/>
       <!-- children copied through in legal order, to ensure the document remains valid -->
@@ -209,13 +205,13 @@
       <xsl:apply-templates select="adl:head|adl:top|adl:foot|adl:field|
                            adl:fieldgroup|adl:auxlist|adl:verb|
                            adl:permission|adl:pragma"/>
-    </adl:form>
+    </form>
   </xsl:template>
 
   <!-- In practice it's likely only to be lists which have properties='user-distinct', 
   but the grammar allows this for pages and forms as well so we'll deal with it -->
   <xsl:template match="adl:page[ @properties='user-distinct']">
-    <adl:page properties='listed'>
+    <page properties='listed'>
       <!-- copy the name attribute through -->
       <xsl:apply-templates select="@name"/>
       <!-- children copied through in legal order, to ensure the document remains valid -->
@@ -225,14 +221,14 @@
       <xsl:apply-templates select="adl:head|adl:top|adl:foot|adl:field|
                            adl:fieldgroup|adl:auxlist|adl:verb|
                            adl:permission|adl:pragma"/>
-    </adl:page>
+    </page>
   </xsl:template>
 
 
   <!-- In practice it's likely only to be lists which have properties='user-distinct', 
   but the grammar allows this for pages and forms as well so we'll deal with it -->
   <xsl:template match="adl:list[ @properties='user-distinct']">
-    <adl:list properties='listed'>
+    <list properties='listed'>
       <!-- copy the name attribute through -->
       <xsl:apply-templates select="@name"/>
       <!-- children copied through in legal order, to ensure the document remains valid -->
@@ -242,7 +238,7 @@
       <xsl:apply-templates select="adl:head|adl:top|adl:foot|adl:field|
                            adl:fieldgroup|adl:auxlist|adl:verb|
                            adl:permission|adl:pragma"/>
-    </adl:list>
+    </list>
   </xsl:template>
 
   <!-- unroll all the explicit properties in the ancestor entity of 
@@ -252,11 +248,11 @@
                   ancestor::adl:entity/descendant::adl:one-to-many |
                   ancestor::adl:entity/descendant::adl:many-to-many |
                   ancestor::adl:entity/descendant::adl:many-to-one">
-      <adl:field>
+      <field>
         <xsl:attribute name="property">
           <xsl:value-of select="@name"/>
         </xsl:attribute>
-      </adl:field>
+      </field>
     </xsl:for-each>
   </xsl:template>
 
@@ -266,14 +262,33 @@
   therefore not inspected -->
   <xsl:template name="unroll-user-distinct">
     <xsl:for-each select="ancestor::adl:entity/descendant::adl:property[@distinct='user']">
-      <adl:field>
+      <field>
         <xsl:attribute name="property">
           <xsl:value-of select="@name"/>
         </xsl:attribute>
-      </adl:field>
+      </field>
     </xsl:for-each>
   </xsl:template>
 
+  <!-- Language constraints -->
+  <xsl:template match="property[ @type = 'string' and not( number( @size))]">
+    <xsl:message terminate="yes">
+      ADL ERROR: Properties of type 'string' must have a valid value for 'size'
+    </xsl:message>
+  </xsl:template>
+
+  <xsl:template match="property[ @type = 'entity' and not( @entity)]">
+    <xsl:message terminate="yes">
+      ADL ERROR: Properties of type 'entity' must have a valid value for 'entity'
+    </xsl:message>
+  </xsl:template>
+
+  <xsl:template match="property[ @type = 'defined' and not( @typedef)]">
+    <xsl:message terminate="yes">
+      ADL ERROR: Properties of type 'defined' must have a valid value for 'typedef'
+    </xsl:message>
+  </xsl:template>
+
 
   <!-- copy anything that isn't explicitly matched -->
   <xsl:template match="@* | node()">
diff --git a/transforms01/adl2entityclass.xslt b/transforms01/adl2entityclass.xslt
index 2be496d..e0fd69a 100755
--- a/transforms01/adl2entityclass.xslt
+++ b/transforms01/adl2entityclass.xslt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>  
   <!--
-    C1873 SRU Hospitality
+    Application Description Language framework
     adl2entityclass.xsl
     
     (c) 2007 Cygnet Solutions Ltd
@@ -8,8 +8,8 @@
     Transform ADL into entity classes
     
     $Author: sb $
-    $Revision: 1.1 $
-    $Date: 2008-01-31 17:06:35 $
+    $Revision: 1.2 $
+    $Date: 2008-02-01 18:25:38 $
   -->
 
   <!-- WARNING WARNING WARNING: Do NOT reformat this file! 
@@ -47,7 +47,7 @@
     stored to CVS -->
 
     <xsl:variable name="transform-rev1"
-                  select="substring( '$Revision: 1.1 $', 11)"/>
+                  select="substring( '$Revision: 1.2 $', 11)"/>
     <xsl:variable name="transform-revision"
                   select="substring( $transform-rev1, 0, string-length( $transform-rev1) - 1)"/>
 
diff --git a/transforms01/adl2mssql.xslt b/transforms01/adl2mssql.xslt
index 64c1fd2..85949dd 100755
--- a/transforms01/adl2mssql.xslt
+++ b/transforms01/adl2mssql.xslt
@@ -1,5 +1,8 @@
 <?xml version="1.0"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0" 
+  xmlns="http://cygnets.co.uk/schemas/adl-1.2" 
+  xmlns:adl="http://cygnets.co.uk/schemas/adl-1.2"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <!--
       C1873 SRU Hospitality
       adl2mssql.xsl
@@ -9,16 +12,17 @@
       Convert ADL to MS-SQL
       
       $Author: sb $
-      $Revision: 1.1 $
+      $Revision: 1.2 $
   -->
     
-    <xsl:output indent="no" encoding="utf-8" method="text"/>
+  <xsl:output indent="no" encoding="utf-8" method="text"/>
+  <xsl:include href="base-type-include.xslt"/>
     
-    <xsl:template match="application"> 
+  <xsl:template match="adl:application"> 
         -------------------------------------------------------------------------------------------------
         --
         --    Database for application <xsl:value-of select="@name"/> version <xsl:value-of select="@version"/>
-        --    Generated for MS-SQL 2000+ using adl2mssql.xsl $Revision: 1.1 $
+        --    Generated for MS-SQL 2000+ using adl2mssql.xsl $Revision: 1.2 $
         --
         --    Code generator (c) 2007 Cygnet Solutions Ltd
         --
@@ -27,23 +31,23 @@
         -------------------------------------------------------------------------------------------------
         --    authentication roles
         -------------------------------------------------------------------------------------------------
-        <xsl:apply-templates select="group"/>
+        <xsl:apply-templates select="adl:group"/>
 
         -------------------------------------------------------------------------------------------------
         --    tables, views and permissions
         -------------------------------------------------------------------------------------------------
-        <xsl:apply-templates select="entity" mode="table"/>
+        <xsl:apply-templates select="adl:entity" mode="table"/>
 
         -------------------------------------------------------------------------------------------------
         --    referential integrity constraints
         -------------------------------------------------------------------------------------------------
-      <xsl:for-each select="entity">
+      <xsl:for-each select="adl:entity">
         <xsl:variable name="nearside" select="@name"/>
         <xsl:for-each select="property[@type='entity']">
           <xsl:variable name="farside" select="@entity"/>
           <xsl:variable name="keyfield" select="@name"/>
           <xsl:choose>
-            <xsl:when test="//entity[@name=$farside]/property[@farkey=$keyfield and @entity=$nearside]">
+            <xsl:when test="//adl:entity[@name=$farside]/adl:property[@farkey=$keyfield and @entity=$nearside]">
               <!-- there's a 'list' property pointing the other way; let it do the heavy hauling -->
             </xsl:when>
             <xsl:otherwise>
@@ -55,7 +59,7 @@
             </xsl:otherwise>
           </xsl:choose>
         </xsl:for-each>
-        <xsl:for-each select="property[@type='list']">
+        <xsl:for-each select="adl:property[@type='list']">
           <xsl:variable name="farkey">
             <xsl:choose>
               <xsl:when test="@farkey">
@@ -87,7 +91,7 @@
         -------------------------------------------------------------------------------------------------
     </xsl:template>
     
-    <xsl:template match="group">
+    <xsl:template match="adl:group">
         execute sp_addrole @rolename = '<xsl:value-of select="@name"/>' 
         
         GO
@@ -108,22 +112,35 @@
     </xsl:template>
 
 
-  <xsl:template match="entity" mode="table">
+  <xsl:template match="adl:entity" mode="table">
     <xsl:variable name="table" select="@name"/>
+      <!-- xsl:choose>
+        <xsl:when test="@table">
+          <xsl:value-of select="@table"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="@name"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable -->
 
         -------------------------------------------------------------------------------------------------
         --    primary table <xsl:value-of select="@name"/>
         -------------------------------------------------------------------------------------------------
         CREATE TABLE  "<xsl:value-of select="@name"/>"
         (
-    <xsl:apply-templates select="property[@type!='link']"/>
-    <xsl:value-of select="@name"/>Id INT IDENTITY( 1, 1) PRIMARY KEY
+          <xsl:for-each select="adl:key/adl:property">
+            <xsl:apply-templates select="."/><xsl:text> PRIMARY KEY,</xsl:text>
+          </xsl:for-each>
+          <xsl:for-each select="adl:property[@type!='link' and @type != 'list']">
+            <xsl:apply-templates select="."/><xsl:if test="position() != last()">,</xsl:if>
+          </xsl:for-each>
         )
 
         GO
 
         ----  permissions  ------------------------------------------------------------------------------
-    <xsl:for-each select="permission">
+    <xsl:for-each select="adl:permission">
         <xsl:call-template name="permission">
           <xsl:with-param name="table" select="$table"/>
         </xsl:call-template>
@@ -132,7 +149,7 @@
       <xsl:if test="property[@type='link']">
         ----  link tables  ------------------------------------------------------------------------------
       </xsl:if>
-      <xsl:for-each select="property[@type='link']">
+      <xsl:for-each select="adl:property[@type='link']">
         <xsl:call-template name="linktable">
           <xsl:with-param name="nearside" select="$table"/>
         </xsl:call-template>
@@ -342,21 +359,58 @@
       </xsl:if>
     </xsl:template>
 
-  <xsl:template match="property[@type='list']">
+  <xsl:template match="adl:property[@type='list']">
         -- Suppressing output of property <xsl:value-of select="@name"/>,
         -- as it is the 'one' end of a one-to-many relationship
   </xsl:template>
 
-  <xsl:template match="property[@type='entity']">
-            "<xsl:value-of select="@name"/>" INT<xsl:if 
-            test="string(@default)"> DEFAULT <xsl:value-of select="@default"/></xsl:if><xsl:if 
-                test="@required='true'"> NOT NULL</xsl:if>,<xsl:text>
-            </xsl:text>
+  <xsl:template match="adl:property[@type='serial']">
+            <xsl:value-of select="@name"/><xsl:text> INT IDENTITY( 1, 1)</xsl:text>
   </xsl:template>
 
-    <xsl:template match="property[@type='defined']">
-        <xsl:variable name="name"><xsl:value-of select="@definition"/></xsl:variable>
-        <xsl:variable name="definitiontype"><xsl:value-of select="/application/definition[@name=$name]/@type"/></xsl:variable>
+  <!-- the grand unified property handler, using the sql-type template to 
+  generate the correct types for each field -->
+  <xsl:template match="adl:property">
+    <xsl:variable name="type">
+      <xsl:call-template name="sql-type">
+        <xsl:with-param name="property" select="."/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="base-type">
+      <xsl:call-template name="base-type">
+        <xsl:with-param name="property" select="."/>
+      </xsl:call-template>
+    </xsl:variable>
+          "<xsl:value-of select="@name"/>" <xsl:value-of select="normalize-space( $type)"/><xsl:if
+            test="string(@default)"> DEFAULT <xsl:choose>
+              <xsl:when test="$base-type = 'integer' or $base-type = 'real' or $base-type = 'money'">
+                <xsl:value-of select="@default"/>
+              </xsl:when>
+              <xsl:otherwise>'<xsl:value-of select="@default"/>'</xsl:otherwise>
+            </xsl:choose>
+    </xsl:if><xsl:if
+                test="@required='true'"> NOT NULL</xsl:if>
+
+  </xsl:template>
+  
+  <!-- properties of type 'entity' are supposed to be being handled by the 
+  grand unified property handler. Unfortunately it gets them wrong and I'm not 
+  sure why. So temporarily this special case template fixes the problem. TODO: 
+  work out what's wrong with the grand unified version -->
+  <xsl:template match="adl:property[@type='entity']">
+    <xsl:variable name="type">
+      <xsl:call-template name="sql-type">
+        <xsl:with-param name="property" select="."/>
+      </xsl:call-template>
+    </xsl:variable>
+          "<xsl:value-of select="@name"/>" <xsl:value-of select="$type"/><xsl:if 
+            test="string(@default)"> DEFAULT <xsl:value-of select="@default"/></xsl:if><xsl:if 
+                test="@required='true'"> NOT NULL</xsl:if>
+  </xsl:template>
+
+    <!-- xsl:template match="adl:property[@type='defined']">
+        <xsl:variable name="name"><xsl:value-of select="@typedef"/></xsl:variable>
+        <xsl:variable name="definitiontype"><xsl:value-of select="//adl:typedef[@name=$name]/@type"/></xsl:variable>
             "<xsl:value-of select="@name"/>"<xsl:text> </xsl:text><xsl:choose>
             <xsl:when test="$definitiontype='string'">VARCHAR( <xsl:value-of 
                 select="/application/definition[@name=$name]/@size"/>)</xsl:when>
@@ -365,56 +419,91 @@
             <xsl:otherwise><xsl:value-of select="$definitiontype"/></xsl:otherwise>
         </xsl:choose><xsl:if 
         test="string(@default)"> DEFAULT <xsl:value-of select="@default"/></xsl:if><xsl:if 
-            test="@required='true'"> NOT NULL</xsl:if>,<xsl:text>
-            </xsl:text>
+            test="@required='true'"> NOT NULL</xsl:if>
     </xsl:template>
 
 
-    <xsl:template match="property[@type='boolean']">
-            -- SQL Server doesn't have proper booleans!
+    <xsl:template match="adl:property[@type='boolean']">
             "<xsl:value-of select="@name"/>" BIT<xsl:choose>
               <xsl:when test="@default='true'"> DEFAULT 1</xsl:when>
               <xsl:when test="@default='false'"> DEFAULT 0</xsl:when>
-            </xsl:choose><xsl:if test="@required='true'"> NOT NULL</xsl:if>,<xsl:text>
-            </xsl:text>
+            </xsl:choose><xsl:if test="@required='true'"> NOT NULL</xsl:if>
     </xsl:template>
 
 
-    <xsl:template match="property[@type='string']">
+    <xsl:template match="adl:property[@type='string']">
             "<xsl:value-of select="@name"/>" VARCHAR( <xsl:value-of select="@size"/>)<xsl:if 
                 test="string(@default)"> DEFAULT '<xsl:value-of select="@default"/>'</xsl:if><xsl:if 
-                    test="@required='true'"> NOT NULL</xsl:if>,<xsl:text>
-            </xsl:text>
+                    test="@required='true'"> NOT NULL</xsl:if>
     </xsl:template>
 
-    <xsl:template match="property[@type='date' or @type = 'time']">
+    <xsl:template match="adl:property[@type='date' or @type = 'time']">
             "<xsl:value-of select="@name"/>" DATETIME<xsl:if
                 test="string(@default)"> DEFAULT <xsl:value-of select="@default"/>
               </xsl:if><xsl:if
-                test="@required='true'"> NOT NULL</xsl:if>,<xsl:text>
-            </xsl:text>
+                test="@required='true'"> NOT NULL</xsl:if>
     </xsl:template>
 
 
-  <xsl:template match="property[@type='integer']">
+  <xsl:template match="adl:property[@type='integer']">
             "<xsl:value-of select="@name"/>" INT<xsl:if 
                 test="string(@default)"> DEFAULT <xsl:value-of select="@default"/></xsl:if><xsl:if 
-                  test="@required='true'"> NOT NULL</xsl:if>,<xsl:text>
-            </xsl:text>
+                  test="@required='true'"> NOT NULL</xsl:if>
   </xsl:template>
     
-  <xsl:template match="property[@type='real']">
+  <xsl:template match="adl:property[@type='real']">
             "<xsl:value-of select="@name"/>" DOUBLE PRECISION<xsl:if 
                 test="string(@default)"> DEFAULT <xsl:value-of select="@default"/></xsl:if><xsl:if 
-                    test="@required='true'"> NOT NULL</xsl:if>,<xsl:text>
-            </xsl:text>
+                    test="@required='true'"> NOT NULL</xsl:if>
   </xsl:template>
     
-  <xsl:template match="property">
+  <xsl:template match="adl:property">
             "<xsl:value-of select="@name"/>" <xsl:text> </xsl:text><xsl:value-of select="@type"/><xsl:if 
                 test="string(@default)"> DEFAULT <xsl:value-of select="@default"/></xsl:if><xsl:if 
-                    test="@required='true'"> NOT NULL</xsl:if>,<xsl:text>
-            </xsl:text>
+                    test="@required='true'"> NOT NULL</xsl:if>
+  </xsl:template -->
+
+  <!-- return the SQL type of the property which is passed as a parameter -->
+  <xsl:template name="sql-type">
+    <xsl:param name="property"/>
+    <xsl:variable name="base-type">
+      <xsl:call-template name="base-type">
+        <xsl:with-param name="property" select="$property"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="base-size">
+      <xsl:call-template name="base-size">
+        <xsl:with-param name="property" select="$property"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:choose>
+      <xsl:when test="$base-type = 'entity'">
+        <xsl:variable name="entity" select="@entity"/>
+        <xsl:call-template name="sql-type">
+          <xsl:with-param name="property" 
+                          select="//adl:entity[@name=$entity]/adl:key/adl:property[position()=1]"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:when test="$base-type = 'link'">
+        ICollection&lt;<xsl:value-of select="@entity"/>&gt;
+      </xsl:when>
+      <xsl:when test="$base-type = 'list'">
+        ICollection&lt;<xsl:value-of select="@entity"/>&gt;
+      </xsl:when>
+      <xsl:when test="$base-type = 'date'">DATETIME</xsl:when>
+      <xsl:when test="$base-type = 'time'">DATETIME</xsl:when>
+      <!-- TODO: if the type was 'defined' then the size should probably come from the typedef -->
+      <xsl:when test="$base-type = 'string'">VARCHAR( <xsl:value-of select="$base-size"/>)</xsl:when>
+      <xsl:when test="$base-type = 'text'">TEXT</xsl:when>
+      <xsl:when test="$base-type = 'boolean'">BIT</xsl:when>
+      <xsl:when test="$base-type = 'timestamp'">TIMESTAMP</xsl:when>
+      <xsl:when test="$base-type = 'integer'">INT</xsl:when>
+      <xsl:when test="$base-type = 'real'">DOUBLE PRECISION</xsl:when>
+      <xsl:when test="$base-type = 'money'">DECIMAL</xsl:when>
+      <xsl:when test="$base-type = 'serial'">INT IDENTITY( 1, 1)</xsl:when>
+      <xsl:otherwise>[sql:unknown? [<xsl:value-of select="$base-type"/>]]</xsl:otherwise>
+    </xsl:choose>
+
   </xsl:template>
 
 
diff --git a/transforms01/base-type-include.xslt b/transforms01/base-type-include.xslt
new file mode 100755
index 0000000..e0bb6b7
--- /dev/null
+++ b/transforms01/base-type-include.xslt
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+    Application Description Language framework
+    base-type-include.xslt
+    
+    (c) 2007 Cygnet Solutions Ltd
+    
+    An xsl transform intended to be included into other XSL stylesheets,
+    intended to keep lookup of the ADL base type from ADL properties in
+    one place for ease of maintenance
+    
+    $Author: sb $
+    $Revision: 1.1 $
+    $Date: 2008-02-01 18:25:38 $
+  -->
+
+<xsl:stylesheet version="1.0"
+  xmlns="http://cygnets.co.uk/schemas/adl-1.2"
+  xmlns:adl="http://cygnets.co.uk/schemas/adl-1.2"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="adl">
+
+
+  <!-- return the base ADL type of the property which is passed as a parameter -->
+  <xsl:template name="base-type">
+    <xsl:param name="property"/>
+    <xsl:choose>
+      <xsl:when test="$property/@type='defined'">
+        <xsl:variable name="definition">
+          <xsl:value-of select="$property/@typedef"/>
+        </xsl:variable>
+        <xsl:message terminate="no">
+          Looking for definition of '<xsl:value-of select="$definition"/>';
+          Found to be defined as type '<xsl:value-of select="/adl:application/adl:typedef[@name=$definition]/@type"/>'
+        </xsl:message>
+        <xsl:value-of select="/adl:application/adl:typedef[@name=$definition]/@type"/>
+      </xsl:when>
+      <xsl:when test="$property/@type='serial'">integer</xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$property/@type"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <!-- return the size of the type of the property which is passed as a parameter -->
+  <xsl:template name="base-size">
+    <xsl:param name="property"/>
+    <xsl:choose>
+      <xsl:when test="$property/@type='defined'">
+        <xsl:variable name="definition">
+          <xsl:value-of select="$property/@typedef"/>
+        </xsl:variable>
+        <xsl:value-of select="/adl:application/adl:typedef[@name=$definition]/@size"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$property/@size"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+</xsl:stylesheet>