whitespace changes

[bacula/bacula] / bacula / src / cats / sql_create.c

diff --git a/bacula/src/cats/sql_create.c b/bacula/src/cats/sql_create.c
index 2cca2d6e4cd7e169b097b7e42a24f33874f2cc91..d595a189094bb20a02b006e2dcf5bd42b6eec742 100644 (file)
--- a/bacula/src/cats/sql_create.c
+++ b/bacula/src/cats/sql_create.c
@@ -34,7 +34,7 @@
 #include "bacula.h"
 #include "cats.h"
 
-#if    HAVE_MYSQL || HAVE_SQLITE
+#if    HAVE_MYSQL || HAVE_SQLITE || HAVE_POSTGRESQL
 
 /* -----------------------------------------------------------------------
  *
@@ -54,6 +54,7 @@ extern void print_dashes(B_DB *mdb);
 extern void print_result(B_DB *mdb);
 extern int QueryDB(char *file, int line, JCR *jcr, B_DB *db, char *select_cmd);
 extern int InsertDB(char *file, int line, JCR *jcr, B_DB *db, char *select_cmd);
+extern int UpdateDB(char *file, int line, JCR *jcr, B_DB *db, char *update_cmd);
 extern void split_path_and_filename(JCR *jcr, B_DB *mdb, char *fname);
 
 
@@ -68,7 +69,6 @@ db_create_job_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)
    time_t stime;
    struct tm tm;
    int stat;
-   char JobId[30];
    utime_t JobTDate;
    char ed1[30];
 
@@ -81,16 +81,11 @@ db_create_job_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)
    strftime(dt, sizeof(dt), "%Y-%m-%d %T", &tm);
    JobTDate = (utime_t)stime;
 
-   if (!db_next_index(jcr, mdb, "Job", JobId)) {
-      jr->JobId = 0;
-      db_unlock(mdb);
-      return 0;
-   }
    /* Must create it */
    Mmsg(&mdb->cmd,
-"INSERT INTO Job (JobId,Job,Name,Type,Level,JobStatus,SchedTime,JobTDate) VALUES \
-(%s,'%s','%s','%c','%c','%c','%s',%s)", 
-          JobId, jr->Job, jr->Name, (char)(jr->Type), (char)(jr->Level), 
+"INSERT INTO Job (Job,Name,Type,Level,JobStatus,SchedTime,JobTDate) VALUES \
+('%s','%s','%c','%c','%c','%s',%s)", 
+          jr->Job, jr->Name, (char)(jr->Type), (char)(jr->Level), 
           (char)(jr->JobStatus), dt, edit_uint64(JobTDate, ed1));
 
    if (!INSERT_DB(jcr, mdb, mdb->cmd)) {
@@ -99,7 +94,7 @@ db_create_job_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)
       jr->JobId = 0;
       stat = 0;
    } else {
-      jr->JobId = sql_insert_id(mdb);
+      jr->JobId = sql_insert_id(mdb, _("Job"));
       stat = 1;
    }
    db_unlock(mdb);
@@ -217,7 +212,7 @@ VALUES ('%s',%u,%u,%d,%d,%d,%d,%d,%s,%s,%u,%u,%s,'%s','%s')",
       pr->PoolId = 0;
       stat = 0;
    } else {
-      pr->PoolId = sql_insert_id(mdb);
+      pr->PoolId = sql_insert_id(mdb, _("Pool"));
       stat = 1;
    }
    db_unlock(mdb);
@@ -236,8 +231,7 @@ int
 db_create_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
 {
    int stat;
-   char ed1[30], ed2[30], ed3[30], ed4[30], ed5[30];
-   char dt[MAX_TIME_LENGTH];
+   char ed1[30], ed2[30], ed3[30], ed4[30], ed5[30], ed6[50], ed7[50];
    struct tm tm;
 
    db_lock(mdb);
@@ -256,21 +250,17 @@ db_create_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
       sql_free_result(mdb);
    }
 
-   /* Make sur Slot, if non-zero, is unique */
-   db_make_slot_unique(jcr, mdb, mr);
+   /* Make sure that if InChanger is non-zero any other identical slot
+    *  has InChanger zero.
+    */
+   db_make_inchanger_unique(jcr, mdb, mr);
 
    /* Must create it */
-   if (mr->LabelDate) {
-      localtime_r(&mr->LabelDate, &tm); 
-      strftime(dt, sizeof(dt), "%Y-%m-%d %T", &tm);
-   } else {
-      bstrncpy(dt, "0000-00-00 00:00:00", sizeof(dt));
-   }
    Mmsg(&mdb->cmd, 
 "INSERT INTO Media (VolumeName,MediaType,PoolId,MaxVolBytes,VolCapacityBytes," 
 "Recycle,VolRetention,VolUseDuration,MaxVolJobs,MaxVolFiles,"
-"VolStatus,LabelDate,Slot,VolBytes) "
-"VALUES ('%s','%s',%u,%s,%s,%d,%s,%s,%u,%u,'%s','%s',%d,%s)", 
+"VolStatus,Slot,VolBytes,InChanger,VolReadTime,VolWriteTime) "
+"VALUES ('%s','%s',%u,%s,%s,%d,%s,%s,%u,%u,'%s',%d,%s,%d,%s,%s)", 
                  mr->VolumeName,
                  mr->MediaType, mr->PoolId, 
                  edit_uint64(mr->MaxVolBytes,ed1),
@@ -280,9 +270,13 @@ db_create_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
                  edit_uint64(mr->VolUseDuration, ed4),
                  mr->MaxVolJobs,
                  mr->MaxVolFiles,
-                 mr->VolStatus, dt,
+                 mr->VolStatus,
                  mr->Slot,
-                 edit_uint64(mr->VolBytes, ed5));
+                 edit_uint64(mr->VolBytes, ed5),
+                 mr->InChanger,
+                 edit_uint64(mr->VolReadTime, ed6),
+                 edit_uint64(mr->VolWriteTime, ed7));
+
 
    Dmsg1(500, "Create Volume: %s\n", mdb->cmd);
    if (!INSERT_DB(jcr, mdb, mdb->cmd)) {
@@ -290,8 +284,16 @@ db_create_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
            mdb->cmd, sql_strerror(mdb));
       stat = 0;
    } else {
-      mr->MediaId = sql_insert_id(mdb);
+      mr->MediaId = sql_insert_id(mdb, _("Media"));
       stat = 1;
+      if (mr->LabelDate) {
+        char dt[MAX_TIME_LENGTH];
+        localtime_r(&mr->LabelDate, &tm);
+         strftime(dt, sizeof(dt), "%Y-%m-%d %T", &tm);
+         Mmsg(&mdb->cmd, "UPDATE Media SET LabelDate='%s' "
+              "WHERE MediaId=%d", dt, mr->MediaId);
+        stat = UPDATE_DB(jcr, mdb, mdb->cmd);
+      }
    }
    db_unlock(mdb);
    return stat;
@@ -358,7 +360,7 @@ FileRetention, JobRetention) VALUES \
       cr->ClientId = 0;
       stat = 0;
    } else {
-      cr->ClientId = sql_insert_id(mdb);
+      cr->ClientId = sql_insert_id(mdb, _("Client"));
       stat = 1;
    }
    db_unlock(mdb);
@@ -468,7 +470,7 @@ int db_create_fileset_record(JCR *jcr, B_DB *mdb, FILESET_DBR *fsr)
       fsr->FileSetId = 0;
       stat = 0;
    } else {
-      fsr->FileSetId = sql_insert_id(mdb);
+      fsr->FileSetId = sql_insert_id(mdb, _("FileSet"));
       fsr->created = true;
       stat = 1;
    }
@@ -578,7 +580,7 @@ static int db_create_file_record(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
       ar->FileId = 0;
       stat = 0;
    } else {
-      ar->FileId = sql_insert_id(mdb);
+      ar->FileId = sql_insert_id(mdb, _("File"));
       stat = 1;
    }
    return stat;
@@ -643,7 +645,7 @@ static int db_create_path_record(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
       ar->PathId = 0;
       stat = 0;
    } else {
-      ar->PathId = sql_insert_id(mdb);
+      ar->PathId = sql_insert_id(mdb, _("Path"));
       stat = 1;
    }
 
@@ -697,9 +699,9 @@ static int db_create_filename_record(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
       Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg);
       ar->FilenameId = 0;
    } else {
-      ar->FilenameId = sql_insert_id(mdb);
+      ar->FilenameId = sql_insert_id(mdb, _("Filename"));
    }
    return ar->FilenameId > 0;
 }
 
-#endif /* HAVE_MYSQL || HAVE_SQLITE */
+#endif /* HAVE_MYSQL || HAVE_SQLITE || HAVE_POSTGRESQL */