Skip to content
Snippets Groups Projects
Commit 9f9da668 authored by Nigel Kukard's avatar Nigel Kukard
Browse files

* Updated database schema to be a bit more tolerant to missing data

* Added INT_UNSIGNED token to convert-tsql
parent 17c3288d
No related branches found
No related tags found
No related merge requests found
......@@ -59,7 +59,8 @@ case "$database" in
-e 's/@POSTLOAD@/SET FOREIGN_KEY_CHECKS=1;/' \
-e 's/@CREATE_TABLE_SUFFIX@/TYPE=InnoDB CHARACTER SET latin1 COLLATE latin1_bin/' \
-e 's/@SERIAL_TYPE@/SERIAL/' \
-e 's/@BIG_INTEGER@/BIGINT UNSIGNED/' \
-e 's/@BIGINT_UNSIGNED@/BIGINT UNSIGNED/' \
-e 's/@INT_UNSIGNED@/INT UNSIGNED/' \
-e 's/@TRACK_KEY_LEN@/255/' \
-e 's/@SERIAL_REF_TYPE@/BIGINT UNSIGNED/' < "$file"
;;
......@@ -71,7 +72,8 @@ case "$database" in
-e 's/@POSTLOAD@/SET FOREIGN_KEY_CHECKS=1;/' \
-e 's/@CREATE_TABLE_SUFFIX@/TYPE=InnoDB CHARACTER SET latin1 COLLATE latin1_bin/' \
-e 's/@SERIAL_TYPE@/SERIAL/' \
-e 's/@BIG_INTEGER@/BIGINT UNSIGNED/' \
-e 's/@BIGINT_UNSIGNED@/BIGINT UNSIGNED/' \
-e 's/@INT_UNSIGNED@/INT UNSIGNED/' \
-e 's/@TRACK_KEY_LEN@/512/' \
-e 's/@SERIAL_REF_TYPE@/BIGINT UNSIGNED/' < "$file"
;;
......@@ -83,7 +85,8 @@ case "$database" in
-e 's/@POSTLOAD@//' \
-e 's/@CREATE_TABLE_SUFFIX@//' \
-e 's/@SERIAL_TYPE@/SERIAL PRIMARY KEY/' \
-e 's/@BIG_INTEGER@/INT8/' \
-e 's/@BIGINT_UNSIGNED@/INT8/' \
-e 's/@INT_UNSIGNED@/INT8/' \
-e 's/@TRACK_KEY_LEN@/512/' \
-e 's/@SERIAL_REF_TYPE@/INT8/' < "$file"
;;
......@@ -95,7 +98,8 @@ case "$database" in
-e 's/@POSTLOAD@//' \
-e 's/@CREATE_TABLE_SUFFIX@//' \
-e 's/@SERIAL_TYPE@/INTEGER PRIMARY KEY AUTOINCREMENT/' \
-e 's/@BIG_INTEGER@/INT8/' \
-e 's/@BIGINT_UNSIGNED@/INT8/' \
-e 's/@INT_UNSIGNED@/INT8/' \
-e 's/@TRACK_KEY_LEN@/512/' \
-e 's/@SERIAL_REF_TYPE@/INT8/' < "$file"
;;
......
......@@ -119,52 +119,52 @@ CREATE TABLE @PREFIX@realm_attributes (
CREATE TABLE @PREFIX@accounting (
ID @SERIAL_TYPE@,
Username VARCHAR(255) NOT NULL,
Username VARCHAR(255),
ServiceType INT UNSIGNED NOT NULL,
ServiceType @INT_UNSIGNED@,
FramedProtocol INT UNSIGNED NOT NULL,
FramedProtocol @INT_UNSIGNED@,
NASPort VARCHAR(255) NOT NULL,
NASPort VARCHAR(255),
NASPortType INT UNSIGNED NOT NULL,
NASPortType @INT_UNSIGNED@,
CallingStationID VARCHAR(255) NOT NULL,
CallingStationID VARCHAR(255),
CalledStationID VARCHAR(255) NOT NULL,
CalledStationID VARCHAR(255),
NASPortID VARCHAR(255) NOT NULL,
NASPortID VARCHAR(255),
AcctSessionID VARCHAR(255) NOT NULL,
AcctSessionID VARCHAR(255),
FramedIPAddress VARCHAR(16) NOT NULL,
FramedIPAddress VARCHAR(16),
AcctAuthentic INT UNSIGNED NOT NULL,
AcctAuthentic @INT_UNSIGNED@,
EventTimestamp DATETIME NOT NULL,
EventTimestamp DATETIME,
NASIdentifier VARCHAR(255) NOT NULL,
NASIdentifier VARCHAR(255),
NASIPAddress VARCHAR(16) NOT NULL,
NASIPAddress VARCHAR(16),
AcctDelayTime INT UNSIGNED NOT NULL,
AcctDelayTime @INT_UNSIGNED@,
AcctSessionTime INT UNSIGNED NOT NULL,
AcctSessionTime @INT_UNSIGNED@,
AcctInputOctets INT UNSIGNED NOT NULL,
AcctInputOctets @INT_UNSIGNED@,
AcctInputGigawords INT UNSIGNED NOT NULL,
AcctInputGigawords @INT_UNSIGNED@,
AcctInputPackets INT UNSIGNED NOT NULL,
AcctInputPackets @INT_UNSIGNED@,
AcctOutputOctets INT UNSIGNED NOT NULL,
AcctOutputOctets @INT_UNSIGNED@,
AcctOutputGigawords INT UNSIGNED NOT NULL,
AcctOutputGigawords @INT_UNSIGNED@,
AcctOutputPackets INT UNSIGNED NOT NULL,
AcctOutputPackets @INT_UNSIGNED@,
AcctStatusType INT UNSIGNED NOT NULL,
AcctStatusType @INT_UNSIGNED@,
AcctTerminateCause INT UNSIGNED NOT NULL
AcctTerminateCause @INT_UNSIGNED@
) @CREATE_TABLE_SUFFIX@;
CREATE INDEX @PREFIX@accounting_idx1 ON @PREFIX@accounting (Username);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment