浏览代码

- get rid of xsl namespaces and use db="..." attributes instead
- uid is a reserved word in Oracle so we have to change it everywhere
(now changed to uuid for oracle), closes SER-150

Jan Janak 19 年之前
父节点
当前提交
3f2376d61d

+ 4 - 7
db/schema/acc.xml

@@ -7,10 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table xmlns:db="http://docbook.org/ns/docbook"
-    xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:pg="http://iptel.org/dbschema/postgres"
-    xmlns:dt="http://iptel.org/dbschema/dbtext">
+<table xmlns:db="http://docbook.org/ns/docbook">
     <name>acc</name>
     <name>acc</name>
     <description>
     <description>
 	<db:para>
 	<db:para>
@@ -37,9 +34,9 @@
     <column id="acc.id">
     <column id="acc.id">
 	<name>id</name>
 	<name>id</name>
 	<type>int</type>
 	<type>int</type>
-	<my:type>INT AUTO_INCREMENT</my:type>
-	<pg:type>SERIAL</pg:type>
-	<dt:type>int,auto</dt:type>
+	<type db="mysql">INT AUTO_INCREMENT</type>
+	<type db="postgres">SERIAL</type>
+	<type db="dbtext">int,auto</type>
 	<description>
 	<description>
 	    ID that uniquely identifies each row. This is automaticaly
 	    ID that uniquely identifies each row. This is automaticaly
 	    generated by the database server. This id is useful for post
 	    generated by the database server. This id is useful for post

+ 1 - 1
db/schema/aliases.xml

@@ -7,7 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table xmlns:my="http://iptel.org/dbschema/mysql">
+<table>
     <name>aliases</name>
     <name>aliases</name>
     <version>6</version>
     <version>6</version>
     <description>
     <description>

+ 1 - 1
db/schema/attr_types.xml

@@ -7,7 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table xmlns:my="http://iptel.org/dbschema/mysql" role="serweb">
+<table role="serweb">
     <name>attr_types</name>
     <name>attr_types</name>
     <version>3</version>
     <version>3</version>
     <description>
     <description>

+ 1 - 0
db/schema/contact_attrs.xml

@@ -13,6 +13,7 @@
 
 
     <column id="contactattrs.uid">
     <column id="contactattrs.uid">
 	<name>uid</name>
 	<name>uid</name>
+	<name db="oracle">uuid</name>
 	<type>string</type>
 	<type>string</type>
 	<size>&id_len;</size>
 	<size>&id_len;</size>
     </column>
     </column>

+ 2 - 2
db/schema/cpl.xml

@@ -7,13 +7,13 @@
 
 
 ]>
 ]>
 
 
-<table id="cpl" xmlns:xi="http://www.w3.org/2001/XInclude"
-   xmlns:pg="http://iptel.org/dbschema/postgres">
+<table id="cpl" xmlns:xi="http://www.w3.org/2001/XInclude">
     <name>cpl</name>
     <name>cpl</name>
     <version>2</version>
     <version>2</version>
 
 
     <column id="cpl.uid">
     <column id="cpl.uid">
 	<name>uid</name>
 	<name>uid</name>
+	<name db="oracle">uuid</name>
 	<type>string</type>
 	<type>string</type>
 	<size>&id_len;</size>
 	<size>&id_len;</size>
     </column>
     </column>

+ 3 - 2
db/schema/credentials.xml

@@ -7,8 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:db="http://docbook.org/ns/docbook">
+<table xmlns:db="http://docbook.org/ns/docbook">
     <name>credentials</name>
     <name>credentials</name>
     <version>7</version>
     <version>7</version>
     <description>
     <description>
@@ -241,6 +240,7 @@
 
 
     <column id="credentials.uid">
     <column id="credentials.uid">
 	<name>uid</name>
 	<name>uid</name>
+	<name db="oracle">uuid</name>
 	<type>string</type>
 	<type>string</type>
 	<size>&id_len;</size>
 	<size>&id_len;</size>
 	<description>
 	<description>
@@ -259,6 +259,7 @@
 
 
     <index>
     <index>
 	<name>uid</name>
 	<name>uid</name>
+	<name db="oracle">uuid</name>
 	<colref linkend="credentials.uid"/>
 	<colref linkend="credentials.uid"/>
     </index>
     </index>
 </table>
 </table>

+ 4 - 7
db/schema/customers.xml

@@ -7,10 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:pg="http://iptel.org/dbschema/postgres"
-    xmlns:dt="http://iptel.org/dbschema/dbtext"
-    role="serweb">
+<table role="serweb">
     <name>customers</name>
     <name>customers</name>
     <version>1</version>
     <version>1</version>
 
 
@@ -21,9 +18,9 @@
     <column id="cu.cid">
     <column id="cu.cid">
 	<name>cid</name>
 	<name>cid</name>
 	<type>unsigned int</type>
 	<type>unsigned int</type>
-	<my:type>INT AUTO_INCREMENT</my:type>
-	<pg:type>SERIAL</pg:type>
-	<dt:type>int,auto</dt:type>
+	<type db="mysql">INT AUTO_INCREMENT</type>
+	<type db="postgres">SERIAL</type>
+	<type db="dbtext">int,auto</type>
 	<description>
 	<description>
 	    Unique id of the customer. The value is auto generated by the databsae
 	    Unique id of the customer. The value is auto generated by the databsae
 	    server.
 	    server.

+ 1 - 4
db/schema/domain.xml

@@ -7,10 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:dt="http://iptel.org/dbschema/dbtext"
-    xmlns:db="http://docbook.org/ns/docbook"
-    xmlns:pg="http://iptel.org/dbschema/postgres">
+<table xmlns:db="http://docbook.org/ns/docbook">
     <name>domain</name>
     <name>domain</name>
     <version>2</version>
     <version>2</version>
 
 

+ 1 - 2
db/schema/domain_attrs.xml

@@ -7,8 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:db="http://docbook.org/ns/docbook">
+<table xmlns:db="http://docbook.org/ns/docbook">
     <name>domain_attrs</name>
     <name>domain_attrs</name>
     <version>1</version>
     <version>1</version>
     <description>
     <description>

+ 1 - 4
db/schema/domain_settings.xml

@@ -7,10 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:pg="http://iptel.org/dbschema/postgres"
-    xmlns:dt="http://iptel.org/dbschema/dbtext"
-    xmlns:db="http://docbook.org/ns/docbook"
+<table xmlns:db="http://docbook.org/ns/docbook"
     role="serweb">
     role="serweb">
     <name>domain_settings</name>
     <name>domain_settings</name>
     <version>1</version>
     <version>1</version>

+ 1 - 3
db/schema/global_attrs.xml

@@ -7,9 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:db="http://docbook.org/ns/docbook"
-    >
+<table xmlns:db="http://docbook.org/ns/docbook">
     <name>global_attrs</name>
     <name>global_attrs</name>
     <version>1</version>
     <version>1</version>
     <description>
     <description>

+ 2 - 1
db/schema/grp.xml

@@ -7,12 +7,13 @@
 
 
 ]>
 ]>
 
 
-<table xmlns:my="http://iptel.org/dbschema/mysql">
+<table>
     <name>grp</name>
     <name>grp</name>
     <version>3</version>
     <version>3</version>
     
     
     <column id="grp.uid">
     <column id="grp.uid">
 	<name>uid</name>
 	<name>uid</name>
+	<name db="oracle">uuid</name>
 	<type>string</type>
 	<type>string</type>
 	<default></default>
 	<default></default>
 	<size>&user_len;</size>
 	<size>&user_len;</size>

+ 4 - 6
db/schema/gw_grp.xml

@@ -7,18 +7,16 @@
 
 
 ]>
 ]>
 
 
-<table xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:pg="http://iptel.org/dbschema/postgres"
-    xmlns:dt="http://iptel.org/dbschema/dbtext">
+<table>
     <name>gw_grp</name>
     <name>gw_grp</name>
     <version>2</version>
     <version>2</version>
 
 
     <column id="gw_grp.id">
     <column id="gw_grp.id">
 	<name>grp_id</name>
 	<name>grp_id</name>
 	<type>int</type>
 	<type>int</type>
-	<my:type>INT AUTO_INCREMENT</my:type>
-	<pg:type>SERIAL</pg:type>
-	<dt:type>int,auto</dt:type>
+	<type db="mysql">INT AUTO_INCREMENT</type>
+	<type db="postgres">SERIAL</type>
+	<type db="dbtext">int,auto</type>
     </column>
     </column>
 
 
     <column>
     <column>

+ 1 - 2
db/schema/i18n.xml

@@ -7,8 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table xmlns:xi="http://www.w3.org/2001/XInclude" 
-    xmlns:my="http://iptel.org/dbschema/mysql">
+<table xmlns:xi="http://www.w3.org/2001/XInclude">
     <name>i18n</name>
     <name>i18n</name>
     <version>1</version>
     <version>1</version>
     
     

+ 1 - 5
db/schema/ipmatch.xml

@@ -7,11 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table role="permissions"
-	xmlns:db="http://docbook.org/ns/docbook"
-	xmlns:my="http://iptel.org/dbschema/mysql"
-	xmlns:pg="http://iptel.org/dbschema/postgres"
-	xmlns:dt="http://iptel.org/dbschema/dbtext">
+<table role="permissions" xmlns:db="http://docbook.org/ns/docbook">
 	<name>ipmatch</name>
 	<name>ipmatch</name>
 	<version>1</version>
 	<version>1</version>
 
 

+ 1 - 0
db/schema/location.xml

@@ -18,6 +18,7 @@
     </description>
     </description>
     <column id="location.uid">
     <column id="location.uid">
 	<name>uid</name>
 	<name>uid</name>
+	<name db="oracle">uuid</name>
 	<type>string</type>
 	<type>string</type>
 	<size>&id_len;</size>
 	<size>&id_len;</size>
 	<description>
 	<description>

+ 4 - 7
db/schema/missed_calls.xml

@@ -7,10 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table xmlns:db="http://docbook.org/ns/docbook"
-    xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:pg="http://iptel.org/dbschema/postgres"
-    xmlns:dt="http://iptel.org/dbschema/dbtext">
+<table xmlns:db="http://docbook.org/ns/docbook">
     <name>missed_calls</name>
     <name>missed_calls</name>
     <description>
     <description>
 	<db:para>
 	<db:para>
@@ -31,9 +28,9 @@
     <column id="mc.id">
     <column id="mc.id">
 	<name>id</name>
 	<name>id</name>
 	<type>int</type>
 	<type>int</type>
-	<my:type>INT AUTO_INCREMENT</my:type>
-	<pg:type>SERIAL</pg:type>
-	<dt:type>int,auto</dt:type>
+	<type db="mysql">INT AUTO_INCREMENT</type>
+	<type db="postgres">SERIAL</type>
+	<type db="dbtext">int,auto</type>
 	<description>
 	<description>
 	    ID that uniquely identifies each row. This is automaticaly
 	    ID that uniquely identifies each row. This is automaticaly
 	    generated by the database server. This id is useful for post
 	    generated by the database server. This id is useful for post

+ 5 - 8
db/schema/offline_winfo.xml

@@ -7,11 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table role="presence"
-    xmlns:db="http://docbook.org/ns/docbook"
-    xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:pg="http://iptel.org/dbschema/postgres"
-    xmlns:dt="http://iptel.org/dbschema/dbtext">
+<table role="presence" xmlns:db="http://docbook.org/ns/docbook">
 	
 	
 	<name>offline_winfo</name>
 	<name>offline_winfo</name>
 	
 	
@@ -20,6 +16,7 @@
 
 
 	<column id="offline_winfo.uid">
 	<column id="offline_winfo.uid">
 		<name>uid</name>
 		<name>uid</name>
+		<name db="oracle">uuid</name>
 		<type>string</type>
 		<type>string</type>
 		<size>&id_len;</size>
 		<size>&id_len;</size>
 	</column>
 	</column>
@@ -66,9 +63,9 @@
 		<name>dbid</name>
 		<name>dbid</name>
 		<type>unsigned int</type>
 		<type>unsigned int</type>
 		<size>10</size>
 		<size>10</size>
-		<my:type>INT(10) UNSIGNED AUTO_INCREMENT</my:type>
-		<pg:type>SERIAL</pg:type>
-		<dt:type>int,auto</dt:type>
+		<type db="mysql">INT(10) UNSIGNED AUTO_INCREMENT</type>
+		<type db="postgres">SERIAL</type>
+		<type db="dbtext">int,auto</type>
 	</column>
 	</column>
 
 
 	<index>
 	<index>

+ 5 - 7
db/schema/phonebook.xml

@@ -7,10 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:pg="http://iptel.org/dbschema/postgres"
-    xmlns:dt="http://iptel.org/dbschema/dbtext"
-    role="serweb">
+<table role="serweb">
     <name>phonebook</name>
     <name>phonebook</name>
     <version>1</version>
     <version>1</version>
 
 
@@ -20,9 +17,9 @@
     <column id="pb.id">
     <column id="pb.id">
 	<name>id</name>
 	<name>id</name>
 	<type>unsigned int</type>
 	<type>unsigned int</type>
-	<my:type>INT AUTO_INCREMENT</my:type>
-	<pg:type>SERIAL</pg:type>
-	<dt:type>int,auto</dt:type>
+	<type db="mysql">INT AUTO_INCREMENT</type>
+	<type db="postgres">SERIAL</type>
+	<type db="dbtext">int,auto</type>
 	<description>
 	<description>
 	    Unique id of the row. The value is auto generated by the databsae
 	    Unique id of the row. The value is auto generated by the databsae
 	    server.
 	    server.
@@ -31,6 +28,7 @@
 
 
     <column id="pb.uid">
     <column id="pb.uid">
 	<name>uid</name>
 	<name>uid</name>
+	<name db="oracle">uuid</name>
 	<type>string</type>
 	<type>string</type>
 	<size>&id_len;</size>
 	<size>&id_len;</size>
 	<description>
 	<description>

+ 2 - 5
db/schema/presentity.xml

@@ -7,11 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table role="presence"
-    xmlns:db="http://docbook.org/ns/docbook"
-    xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:pg="http://iptel.org/dbschema/postgres"
-    xmlns:dt="http://iptel.org/dbschema/dbtext">
+<table role="presence" xmlns:db="http://docbook.org/ns/docbook">
 	
 	
 	<name>presentity</name>
 	<name>presentity</name>
 
 
@@ -32,6 +28,7 @@
 
 
 	<column id="presentity.uid">
 	<column id="presentity.uid">
 		<name>uid</name>
 		<name>uid</name>
+		<name db="oracle">uuid</name>
 		<type>string</type>
 		<type>string</type>
 		<size>&id_len;</size>
 		<size>&id_len;</size>
 	</column>
 	</column>

+ 1 - 5
db/schema/presentity_contact.xml

@@ -7,11 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table role="presence"
-    xmlns:db="http://docbook.org/ns/docbook"
-    xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:pg="http://iptel.org/dbschema/postgres"
-    xmlns:dt="http://iptel.org/dbschema/dbtext">
+<table role="presence" xmlns:db="http://docbook.org/ns/docbook">
 
 
 	<name>presentity_contact</name>
 	<name>presentity_contact</name>
 	
 	

+ 1 - 5
db/schema/presentity_extensions.xml

@@ -7,11 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table role="presence"
-    xmlns:db="http://docbook.org/ns/docbook"
-    xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:pg="http://iptel.org/dbschema/postgres"
-    xmlns:dt="http://iptel.org/dbschema/dbtext">
+<table role="presence" xmlns:db="http://docbook.org/ns/docbook">
 
 
 	<name>presentity_extensions</name>
 	<name>presentity_extensions</name>
     
     

+ 1 - 5
db/schema/presentity_notes.xml

@@ -7,11 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table role="presence"
-    xmlns:db="http://docbook.org/ns/docbook"
-    xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:pg="http://iptel.org/dbschema/postgres"
-    xmlns:dt="http://iptel.org/dbschema/dbtext">
+<table role="presence" xmlns:db="http://docbook.org/ns/docbook">
 
 
 	<name>presentity_notes</name>
 	<name>presentity_notes</name>
     
     

+ 1 - 5
db/schema/rls_subscription.xml

@@ -7,11 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table role="presence"
-    xmlns:db="http://docbook.org/ns/docbook"
-    xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:pg="http://iptel.org/dbschema/postgres"
-    xmlns:dt="http://iptel.org/dbschema/dbtext">
+<table role="presence" xmlns:db="http://docbook.org/ns/docbook">
     <name>rls_subscription</name>
     <name>rls_subscription</name>
     <version>1</version>
     <version>1</version>
     
     

+ 1 - 5
db/schema/rls_vs.xml

@@ -7,11 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table role="presence"
-    xmlns:db="http://docbook.org/ns/docbook"
-    xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:pg="http://iptel.org/dbschema/postgres"
-    xmlns:dt="http://iptel.org/dbschema/dbtext">
+<table role="presence" xmlns:db="http://docbook.org/ns/docbook">
     <name>rls_vs</name>
     <name>rls_vs</name>
     <version>1</version>
     <version>1</version>
 	
 	

+ 1 - 5
db/schema/rls_vs_names.xml

@@ -7,11 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table role="presence"
-    xmlns:db="http://docbook.org/ns/docbook"
-    xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:pg="http://iptel.org/dbschema/postgres"
-    xmlns:dt="http://iptel.org/dbschema/dbtext">
+<table role="presence" xmlns:db="http://docbook.org/ns/docbook">
     <name>rls_vs_names</name>
     <name>rls_vs_names</name>
     <version>1</version>
     <version>1</version>
 	
 	

+ 1 - 6
db/schema/ser.xml

@@ -7,12 +7,7 @@
 
 
 ]>
 ]>
 
 
-<database xmlns:my="http://iptel.org/dbschema/mysql"
-          xmlns:pg="http://iptel.org/dbschema/postgres"
-          xmlns:or="http://iptel.org/dbschema/oracle"
-          xmlns:dt="http://iptel.org/dbschema/dbtext"
-          xmlns:xi="http://www.w3.org/2001/XInclude"
->
+<database xmlns:xi="http://www.w3.org/2001/XInclude">
     <name>ser</name>
     <name>ser</name>
 
 
     <xi:include href="version.xml"/>
     <xi:include href="version.xml"/>

+ 5 - 6
db/schema/silo.xml

@@ -7,18 +7,16 @@
 
 
 ]>
 ]>
 
 
-<table xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:pg="http://iptel.org/dbschema/postgres"
-    xmlns:dt="http://iptel.org/dbschema/dbtext">
+<table>
     <name>silo</name>
     <name>silo</name>
     <version>4</version>
     <version>4</version>
 
 
     <column id="silo.mid">
     <column id="silo.mid">
 	<name>mid</name>
 	<name>mid</name>
 	<type>int</type>
 	<type>int</type>
-	<my:type>INT AUTO_INCREMENT</my:type>
-	<pg:type>SERIAL</pg:type>
-	<dt:type>int,auto</dt:type>
+	<type db="mysql">INT AUTO_INCREMENT</type>
+	<type db="postgres">SERIAL</type>
+	<type db="dbtext">int,auto</type>
     </column>
     </column>
 
 
     <column>
     <column>
@@ -41,6 +39,7 @@
 
 
     <column>
     <column>
 	<name>uid</name>
 	<name>uid</name>
+	<name db="oracle">uuid</name>
 	<type>string</type>
 	<type>string</type>
 	<size>&id_len;</size>
 	<size>&id_len;</size>
     </column>
     </column>

+ 5 - 6
db/schema/speed_dial.xml

@@ -7,22 +7,21 @@
 
 
 ]>
 ]>
 
 
-<table xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:pg="http://iptel.org/dbschema/postgres"
-    xmlns:dt="http://iptel.org/dbschema/dbtext">
+<table>
     <name>speed_dial</name>
     <name>speed_dial</name>
     <version>2</version>
     <version>2</version>
 
 
     <column id="sd.id">
     <column id="sd.id">
 	<name>id</name>
 	<name>id</name>
 	<type>int</type>
 	<type>int</type>
-	<my:type>INT AUTO_INCREMENT</my:type>
-	<pg:type>SERIAL</pg:type>
-	<dt:type>int,auto</dt:type>
+	<type db="mysql">INT AUTO_INCREMENT</type>
+	<type db="postgres">SERIAL</type>
+	<type db="dbtext">int,auto</type>
     </column>
     </column>
 
 
     <column id="sd.uid">
     <column id="sd.uid">
 	<name>uid</name>
 	<name>uid</name>
+	<name db="oracle">uuid</name>
 	<type>string</type>
 	<type>string</type>
 	<size>&id_len;</size>
 	<size>&id_len;</size>
     </column>
     </column>

+ 1 - 5
db/schema/tuple_extensions.xml

@@ -7,11 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table role="presence"
-    xmlns:db="http://docbook.org/ns/docbook"
-    xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:pg="http://iptel.org/dbschema/postgres"
-    xmlns:dt="http://iptel.org/dbschema/dbtext">
+<table role="presence" xmlns:db="http://docbook.org/ns/docbook">
 
 
 	<name>tuple_extensions</name>
 	<name>tuple_extensions</name>
 
 

+ 1 - 5
db/schema/tuple_notes.xml

@@ -7,11 +7,7 @@
 
 
 ]>
 ]>
 
 
-<table role="presence"
-    xmlns:db="http://docbook.org/ns/docbook"
-    xmlns:my="http://iptel.org/dbschema/mysql"
-    xmlns:pg="http://iptel.org/dbschema/postgres"
-    xmlns:dt="http://iptel.org/dbschema/dbtext">
+<table role="presence" xmlns:db="http://docbook.org/ns/docbook">
 
 
 	<name>tuple_notes</name>
 	<name>tuple_notes</name>
 
 

+ 1 - 0
db/schema/uri.xml

@@ -13,6 +13,7 @@
 
 
     <column id="uri.uid">
     <column id="uri.uid">
 	<name>uid</name>
 	<name>uid</name>
+	<name db="oracle">uuid</name>
 	<type>string</type>
 	<type>string</type>
 	<size>&id_len;</size>
 	<size>&id_len;</size>
     </column>
     </column>

+ 1 - 0
db/schema/user_attrs.xml

@@ -13,6 +13,7 @@
 
 
     <column id="userattrs.uid">
     <column id="userattrs.uid">
 	<name>uid</name>
 	<name>uid</name>
+	<name db="oracle">uuid</name>
 	<type>string</type>
 	<type>string</type>
 	<size>&id_len;</size>
 	<size>&id_len;</size>
     </column>
     </column>

+ 1 - 3
db/schema/version.xml

@@ -2,9 +2,7 @@
 <!DOCTYPE table PUBLIC "-//iptel.org//DTD DBSchema V1.0//EN"
 <!DOCTYPE table PUBLIC "-//iptel.org//DTD DBSchema V1.0//EN"
   "http://iptel.org/dbschema/dtd/1.0/dbschema.dtd">
   "http://iptel.org/dbschema/dtd/1.0/dbschema.dtd">
 
 
-<table id="version" xmlns:xi="http://www.w3.org/2001/XInclude"
-   xmlns:pg="http://iptel.org/dbschema/postgres"
->
+<table id="version" xmlns:xi="http://www.w3.org/2001/XInclude">
     <name>
     <name>
 	version
 	version
     </name>
     </name>