another try with function for clientid

bareos · Sep 18, 2018 · ca3be49 · ca3be49
1 parent 677ae3b
commit ca3be49
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/core/src/cats/dbi.cc b/core/src/cats/dbi.cc
@@ -1219,7 +1219,6 @@ bool BareosDbDBI::SqlBatchStart(JobControlRecord *jcr)
                                      "Name varchar,"
                                      "LStat varchar,"
                                      "MD5 varchar,"
-				     "ClientId int,"
                                      "DeltaSeq int)")) {
          Dmsg0(500, "SqlBatchStart failed\n");
          goto bail_out;
@@ -1386,7 +1385,7 @@ bool BareosDbDBI::SqlBatchInsert(JobControlRecord *jcr, AttributesDbRecord *ar)
       postgresql_copy_escape(esc_path, path, pnl);
       len = Mmsg(cmd, "%u\t%s\t%s\t%s\t%s\t%s\t%u\n",
                      ar->FileIndex, edit_int64(ar->JobId, ed1), esc_path,
-                     esc_name, ar->attr, digest, ar->ClientId, ar->DeltaSeq);
+                     esc_name, ar->attr, digest, ar->DeltaSeq);
 
       /*
        * libdbi don't support CopyData and we need call a postgresql

diff --git a/core/src/cats/sql_create.cc b/core/src/cats/sql_create.cc
@@ -863,7 +863,7 @@ bool BareosDb::WriteBatchFileRecords(JobControlRecord *jcr)
    if (!jcr->db_batch->SqlQuery(
                      "INSERT INTO File (FileIndex, JobId, PathId, Name, LStat, MD5, DeltaSeq, Fhinfo, Fhnode, ClientId) "
                      "SELECT batch.FileIndex, batch.JobId, Path.PathId, "
-                     "batch.Name, batch.LStat, batch.MD5, batch.DeltaSeq, batch.Fhinfo, batch.Fhnode, batch.ClientId "
+                     "batch.Name, batch.LStat, batch.MD5, batch.DeltaSeq, batch.Fhinfo, batch.Fhnode, client_of_job (batch.JobId) "
                      "FROM batch "
                      "JOIN Path ON (batch.Path = Path.Path) ")) {
       Jmsg1(jcr, M_FATAL, 0, "Fill File table %s\n", errmsg);