diff options
| author | Damien Regad <dregad@mantisbt.org> | 2020-01-12 19:29:50 +0100 |
|---|---|---|
| committer | Damien Regad <dregad@mantisbt.org> | 2020-01-12 19:29:50 +0100 |
| commit | 88106d48a4e6c0d212ba9f82f57a0ef91efb12dd (patch) | |
| tree | 4741fe97b2cfc79051d72588cf20f868da3ce6db | |
| parent | 9990271bb5d5f1334f3118f3b1a02ccf0f0cd8a6 (diff) | |
| parent | caee1109d7e75bbe104cfcfc30a3283e289113aa (diff) | |
| download | adodb-88106d48a4e6c0d212ba9f82f57a0ef91efb12dd.tar.gz adodb-88106d48a4e6c0d212ba9f82f57a0ef91efb12dd.tar.bz2 adodb-88106d48a4e6c0d212ba9f82f57a0ef91efb12dd.zip | |
Merge branch 'peterdd-xml'
| -rw-r--r-- | session/session_schema.xml | 2 | ||||
| -rw-r--r-- | session/session_schema2.xml | 2 | ||||
| -rw-r--r-- | xmlschema03.dtd | 36 |
3 files changed, 25 insertions, 15 deletions
diff --git a/session/session_schema.xml b/session/session_schema.xml index 27e47bfe..c1f75316 100644 --- a/session/session_schema.xml +++ b/session/session_schema.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <schema version="0.2"> <table name="sessions"> - <desc>table for ADOdb session-management</desc> + <descr>table for ADOdb session-management</descr> <field name="SESSKEY" type="C" size="32"> <descr>session key</descr> diff --git a/session/session_schema2.xml b/session/session_schema2.xml index f0d3ec94..89cb4f28 100644 --- a/session/session_schema2.xml +++ b/session/session_schema2.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <schema version="0.3"> <table name="sessions2"> - <desc>table for ADOdb session-management</desc> + <descr>table for ADOdb session-management</descr> <field name="SESSKEY" type="C" size="64"> <descr>session key</descr> diff --git a/xmlschema03.dtd b/xmlschema03.dtd index 97850bc7..351ea44b 100644 --- a/xmlschema03.dtd +++ b/xmlschema03.dtd @@ -1,17 +1,22 @@ -<?xml version="1.0"?> -<!DOCTYPE adodb_schema [ <!ELEMENT schema (table*, sql*)> <!ATTLIST schema version CDATA #REQUIRED> <!ELEMENT table (descr?, (field+|DROP), constraint*, opt*, index*, data*)> -<!ATTLIST table name CDATA #REQUIRED platform CDATA #IMPLIED version CDATA #IMPLIED> +<!ATTLIST table + name CDATA #REQUIRED + platform CDATA #IMPLIED + version CDATA #IMPLIED> <!ELEMENT field (descr?, (NOTNULL|KEY|PRIMARY)?, (AUTO|AUTOINCREMENT)?, (DEFAULT|DEFDATE|DEFTIMESTAMP)?, NOQUOTE?, UNSIGNED?, constraint*, opt*)> -<!ATTLIST field name CDATA #REQUIRED type (C|C2|X|X2|B|D|T|L|I|F|N) #REQUIRED size CDATA #IMPLIED opts CDATA #IMPLIED> +<!ATTLIST + field name CDATA #REQUIRED + type (C|C2|X|X2|XL|B|D|T|L|I|I1|I2|I4|I8|F|N) #REQUIRED + size CDATA #IMPLIED + opts CDATA #IMPLIED> <!ELEMENT data (descr?, row+)> <!ATTLIST data platform CDATA #IMPLIED> <!ELEMENT row (f+)> -<!ELEMENT f (#CDATA)> +<!ELEMENT f (#PCDATA)> <!ATTLIST f name CDATA #IMPLIED> -<!ELEMENT descr (#CDATA)> +<!ELEMENT descr (#PCDATA)> <!ELEMENT NOTNULL EMPTY> <!ELEMENT KEY EMPTY> <!ELEMENT PRIMARY EMPTY> @@ -24,20 +29,25 @@ <!ELEMENT NOQUOTE EMPTY> <!ELEMENT UNSIGNED EMPTY> <!ELEMENT DROP EMPTY> -<!ELEMENT constraint (#CDATA)> +<!ELEMENT constraint (#PCDATA)> <!ATTLIST constraint platform CDATA #IMPLIED> -<!ELEMENT opt (#CDATA)> +<!ELEMENT opt (#PCDATA)> <!ATTLIST opt platform CDATA #IMPLIED> <!ELEMENT index ((col+|DROP), CLUSTERED?, BITMAP?, UNIQUE?, FULLTEXT?, HASH?, descr?)> -<!ATTLIST index name CDATA #REQUIRED platform CDATA #IMPLIED> -<!ELEMENT col (#CDATA)> +<!ATTLIST index + name CDATA #REQUIRED + platform CDATA #IMPLIED> +<!ELEMENT col (#PCDATA)> <!ELEMENT CLUSTERED EMPTY> <!ELEMENT BITMAP EMPTY> <!ELEMENT UNIQUE EMPTY> <!ELEMENT FULLTEXT EMPTY> <!ELEMENT HASH EMPTY> <!ELEMENT sql (query+, descr?)> -<!ATTLIST sql name CDATA #IMPLIED platform CDATA #IMPLIED, key CDATA, prefixmethod (AUTO|MANUAL|NONE)> -<!ELEMENT query (#CDATA)> +<!ATTLIST sql + name CDATA #IMPLIED + platform CDATA #IMPLIED + key CDATA #IMPLIED + prefixmethod (AUTO|MANUAL|NONE) #IMPLIED> +<!ELEMENT query (#PCDATA)> <!ATTLIST query platform CDATA #IMPLIED> -]>
\ No newline at end of file |