- fixed conflicting column names

db/schema/silo.xml

@@ -22,13 +22,13 @@
     </column>
 
     <column>
-	<name>from</name>
+	<name>from_hdr</name>
 	<type>string</type>
 	<size>255</size>
     </column>
 
     <column>
-	<name>to</name>
+	<name>to_hdr</name>
 	<type>string</type>
 	<size>255</size>
     </column>

scripts/dbtext/ser_db/silo

@@ -1 +1 @@
-mid(int,auto) from(str) to(str) ruri(str) uid(str) inc_time(int) exp_time(int) ctype(str) body(str) 
+mid(int,auto) from_hdr(str) to_hdr(str) ruri(str) uid(str) inc_time(int) exp_time(int) ctype(str) body(str) 

scripts/mysql/my_create.sql

@@ -248,8 +248,8 @@ CREATE TABLE grp (
 
 CREATE TABLE silo (
     mid INT AUTO_INCREMENT NOT NULL,
-    from VARCHAR(255) NOT NULL,
-    to VARCHAR(255) NOT NULL,
+    from_hdr VARCHAR(255) NOT NULL,
+    to_hdr VARCHAR(255) NOT NULL,
     ruri VARCHAR(255) NOT NULL,
     uid VARCHAR(64) NOT NULL,
     inc_time DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00',

scripts/oracle/or_create.sql

@@ -236,8 +236,8 @@ CREATE TABLE grp (
 
 CREATE TABLE silo (
     mid int NOT NULL,
-    from string(255) NOT NULL,
-    to string(255) NOT NULL,
+    from_hdr string(255) NOT NULL,
+    to_hdr string(255) NOT NULL,
     ruri string(255) NOT NULL,
     uid string(64) NOT NULL,
     inc_time datetime NOT NULL DEFAULT '1970-01-01 00:00:00',

scripts/postgres/pg_create.sql

@@ -257,8 +257,8 @@ CREATE INDEX grp_idx ON grp (uid, grp);
 
 CREATE TABLE silo (
     mid SERIAL NOT NULL,
-    from VARCHAR(255) NOT NULL,
-    to VARCHAR(255) NOT NULL,
+    from_hdr VARCHAR(255) NOT NULL,
+    to_hdr VARCHAR(255) NOT NULL,
     ruri VARCHAR(255) NOT NULL,
     uid VARCHAR(64) NOT NULL,
     inc_time TIMESTAMP NOT NULL DEFAULT '1970-01-01 00:00:00',