Eliminate bsd_queue conflict with winnt.h

[bacula/bacula] / bacula / src / cats / make_postgresql_tables.in

diff --git a/bacula/src/cats/make_postgresql_tables.in b/bacula/src/cats/make_postgresql_tables.in
index 337a74ff4e2286f046874811e98a51f4eaa91c9b..71a3720bc053545c76de75d83ecf7a2d8acd11c3 100644 (file)
--- a/bacula/src/cats/make_postgresql_tables.in
+++ b/bacula/src/cats/make_postgresql_tables.in
@@ -110,12 +110,9 @@ create table media
         default 0,
     poolid            integer               not null,
     mediatype         text                  not null,
-    firstwritten      timestamp without time zone not null
-        default current_timestamp,
-    lastwritten       timestamp without time zone not null
-        default current_timestamp,
-    labeldate         timestamp without time zone not null
-       default current_timestamp,
+    firstwritten      timestamp without time zone,
+    lastwritten       timestamp without time zone,
+    labeldate         timestamp without time zone,
     voljobs           integer               not null
         default 0,
     volfiles          integer               not null
@@ -146,12 +143,14 @@ create table media
         default 0,
     maxvolbytes       bigint                not null
         default 0,
-    drive             integer               not null
-        default 0,
     inchanger         smallint              not null
         default 0,
     mediaaddressing   smallint              not null
         default 0,
+    volreadtime       bigint                not null
+        default 0,
+    volwritetime      bigint                not null
+        default 0,
     primary key (mediaid)
 );
 
@@ -175,7 +174,7 @@ create table job
     volsessiontime    integer               not null
         default 0,
     jobfiles          integer               not null
-       default 0,
+        default 0,
     jobbytes          bigint                not null
         default 0,
     joberrors         integer               not null