- improve 'autoincrement' type for postgres, now its not necessary anymore to

  specify this workaround in the scheme sources


git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4000 689a6050-402a-0410-94f2-e92a70836424

lib/srdb1/schema/acc.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>unique ID</description>
     </column>

lib/srdb1/schema/address.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>unique ID</description>
     </column>

lib/srdb1/schema/aliases.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>unique ID</description>
     </column>

lib/srdb1/schema/carrierfailureroute.xml

@@ -22,7 +22,6 @@
 			  <size>&table_id_len;</size>
 			  <autoincrement/>
 			  <primary/>
-			  <type db="postgres">SERIAL PRIMARY KEY</type>
 			  <type db="dbtext">int,auto</type>
 			  <description>unique ID</description>
 		  </column>

lib/srdb1/schema/carrierroute.xml

@@ -22,7 +22,6 @@
 			  <size>&table_id_len;</size>
 			  <autoincrement/>
 			  <primary/>
-			  <type db="postgres">SERIAL PRIMARY KEY</type>
 			  <type db="dbtext">int,auto</type>
 			  <description>unique ID</description>
 		  </column>

lib/srdb1/schema/cpl.xml

@@ -21,7 +21,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>Unique ID</description>
     </column>

lib/srdb1/schema/dbaliases.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>unique ID</description>
     </column>

lib/srdb1/schema/dialog.xml

@@ -23,7 +23,6 @@
 		<size>&table_id_len;</size>
 		<autoincrement/>
 		<primary/>
-		<type db="postgres">SERIAL PRIMARY KEY</type>
 		<type db="dbtext">int,auto</type>
 		<description>unique ID</description>
 	</column>

lib/srdb1/schema/dispatcher.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>unique ID</description>
     </column>

lib/srdb1/schema/domain.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>unique ID</description>
     </column>

lib/srdb1/schema/domainpolicy.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>unique ID</description>
     </column>

lib/srdb1/schema/globalblacklist.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>unique ID</description>
     </column>

lib/srdb1/schema/grp.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>unique ID</description>
     </column>

lib/srdb1/schema/gw.xml

@@ -24,7 +24,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
     </column>
 

lib/srdb1/schema/imc_members.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>unique ID</description>
     </column>

lib/srdb1/schema/imc_rooms.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>unique ID</description>
     </column>

lib/srdb1/schema/lcr.xml

@@ -23,7 +23,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
     </column>
 

lib/srdb1/schema/location.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>unique ID</description>
     </column>

lib/srdb1/schema/missed_calls.xml

@@ -21,7 +21,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>unique ID</description>
     </column>

lib/srdb1/schema/pdt.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>Unique ID</description>
     </column>

lib/srdb1/schema/pr_active_watchers.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>Unique ID</description>
     </column>

lib/srdb1/schema/pr_presentity.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>Unique ID</description>
     </column>

lib/srdb1/schema/pr_pua.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>Unique ID</description>
     </column>

lib/srdb1/schema/pr_watchers.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>Unique ID</description>
     </column>

lib/srdb1/schema/pr_xcap.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>Unique ID</description>
     </column>

lib/srdb1/schema/re_grp.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>unique ID</description>
     </column>

lib/srdb1/schema/rls_presentity.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>Unique ID</description>
     </column>

lib/srdb1/schema/rls_watchers.xml

@@ -23,7 +23,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>Unique ID</description>
     </column>

lib/srdb1/schema/route_tree.xml

@@ -23,7 +23,6 @@
 			  <natural/>
 			  <autoincrement/>
 			  <primary/>
-			  <type db="postgres">SERIAL PRIMARY KEY</type>
 			  <type db="dbtext">int,auto</type>
 			  <description>unique ID</description>
 		  </column>

lib/srdb1/schema/silo.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>unique ID</description>
     </column>

lib/srdb1/schema/sip_trace.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>unique ID</description>
     </column>

lib/srdb1/schema/speed_dial.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>unique ID</description>
     </column>

lib/srdb1/schema/subscriber.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>Unique ID</description>
     </column>

lib/srdb1/schema/template.xml

@@ -21,7 +21,6 @@
         <size>&table_id_len;</size> <!-- use a value from entities.xml -->
         <primary/><!-- primary key -->
         <autoincrement/><!-- auto increment the id -->
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type> <!-- this don't work for dbtext at the moment, so we specify the raw "SQL" code -->
         <description>unique ID</description>
     </column>

lib/srdb1/schema/trusted.xml

@@ -6,8 +6,6 @@
 %entities;
 
 ]>
-<!--KEY Key1 (src_ip),
-    PRIMARY KEY (id)-->
 
 <table id="trusted" xmlns:db="http://docbook.org/ns/docbook">
     <name>trusted</name>
@@ -24,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>unique ID</description>
     </column>

lib/srdb1/schema/uri.xml

@@ -23,7 +23,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
     </column>
 

lib/srdb1/schema/userblacklist.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>unique ID</description>
     </column>

lib/srdb1/schema/usr_preferences.xml

@@ -22,7 +22,6 @@
         <size>&table_id_len;</size>
         <autoincrement/>
         <primary/>
-        <type db="postgres">SERIAL PRIMARY KEY</type>
         <type db="dbtext">int,auto</type>
         <description>Unique ID</description>
     </column>