Sync a few changes from cvs head

diff --git a/doc/examples/postgresql.sql b/doc/examples/postgresql.sql
index 5d3986c..d1ab5ac 100644 (file)
--- a/doc/examples/postgresql.sql
+++ b/doc/examples/postgresql.sql
@@ -43,9 +43,9 @@ CREATE TABLE radacct (
 -- CREATE UNIQUE INDEX radacct_whoson on radacct (AcctStartTime, nasipaddress);
 
 -- For use by onoff-, update-, stop- and simul_* queries
-CREATE INDEX radacct_active_user_idx ON radacct (userName) WHERE AcctStopTime IS NULL;
+CREATE INDEX radacct_active_user_idx ON radacct (UserName, NASIPAddress, AcctSessionId) WHERE AcctStopTime IS NULL;
 -- and for common statistic queries:
-CREATE INDEX radacct_start_user_idx ON radacct (acctStartTime, UserName);
+CREATE INDEX radacct_start_user_idx ON radacct (AcctStartTime, UserName);
 -- and, optionally
 -- CREATE INDEX radacct_stop_user_idx ON radacct (acctStopTime, UserName);
 
@@ -198,7 +198,7 @@ CREATE TABLE radippool (
        calling_station_id text DEFAULT ''::text NOT NULL,
        expiry_time timestamp(0) without time zone NOT NULL,
        username text DEFAULT ''::text,
-       calledstationid character varying(64),
+       CalledStationId character varying(64),
        groupname character varying(30),
        pool_key character varying(30) NOT NULL
 );