Important protocol change -- see kes29Oct02

[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 5d63af75772a2e3d367a7499953383b9cedee3a5..348ede4035d8126d308db05564b932c1ddd5ca36 100644 (file)
--- a/bacula/src/cats/sql_create.c
+++ b/bacula/src/cats/sql_create.c
@@ -69,7 +69,7 @@ db_create_job_record(B_DB *mdb, JOB_DBR *jr)
    time_t stime;
    struct tm tm;
    int stat;
-   char *JobId;
+   char JobId[30];
    btime_t JobTDate;
    char ed1[30];
 
@@ -80,18 +80,17 @@ db_create_job_record(B_DB *mdb, JOB_DBR *jr)
    JobTDate = (btime_t)stime;
 
    db_lock(mdb);
-   JobId = db_next_index(mdb, "Job");
-   if (!JobId) {
+   if (!db_next_index(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, SchedTime, JobTDate) VALUES \
-(%s, \"%s\", \"%s\", \"%c\", \"%c\", \"%s\", %s)", 
-          JobId, jr->Job, jr->Name, (char)(jr->Type), (char)(jr->Level), dt,
-          edit_uint64(JobTDate, ed1));
+"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), 
+          (char)(jr->JobStatus), dt, edit_uint64(JobTDate, ed1));
 
    if (!INSERT_DB(mdb, mdb->cmd)) {
       Mmsg2(&mdb->errmsg, _("Create DB Job record %s failed. ERR=%s\n"), 
@@ -134,9 +133,11 @@ JobId=%d AND MediaId=%d", jm->JobId, jm->MediaId);
 
    /* Must create it */
    Mmsg(&mdb->cmd, 
-"INSERT INTO JobMedia (JobId, MediaId, FirstIndex, LastIndex) \
-VALUES (%d, %d, %u, %u)", 
-       jm->JobId, jm->MediaId, jm->FirstIndex, jm->LastIndex);
+"INSERT INTO JobMedia (JobId,MediaId,FirstIndex,LastIndex,\
+StartFile,EndFile,StartBlock,EndBlock) \
+VALUES (%u,%u,%u,%u,%u,%u,%u,%u)", 
+       jm->JobId, jm->MediaId, jm->FirstIndex, jm->LastIndex,
+       jm->StartFile, jm->EndFile, jm->StartBlock, jm->EndBlock);
 
    Dmsg0(30, mdb->cmd);
    if (!INSERT_DB(mdb, mdb->cmd)) {
@@ -164,7 +165,7 @@ db_create_pool_record(B_DB *mdb, POOL_DBR *pr)
    char ed1[30];
 
    db_lock(mdb);
-   Mmsg(&mdb->cmd, "SELECT PoolId,Name FROM Pool WHERE Name=\"%s\"", pr->Name);
+   Mmsg(&mdb->cmd, "SELECT PoolId,Name FROM Pool WHERE Name='%s'", pr->Name);
    Dmsg1(20, "selectpool: %s\n", mdb->cmd);
 
    if (QUERY_DB(mdb, mdb->cmd)) {
@@ -184,7 +185,7 @@ db_create_pool_record(B_DB *mdb, POOL_DBR *pr)
    Mmsg(&mdb->cmd, 
 "INSERT INTO Pool (Name, NumVols, MaxVols, UseOnce, UseCatalog, \
 AcceptAnyVolume, AutoPrune, Recycle, VolRetention, PoolType, LabelFormat) \
-VALUES (\"%s\", %d, %d, %d, %d, %d, %d, %d, %s, \"%s\", \"%s\")", 
+VALUES ('%s', %d, %d, %d, %d, %d, %d, %d, %s, '%s', '%s')", 
                  pr->Name,
                  pr->NumVols, pr->MaxVols,
                  pr->UseOnce, pr->UseCatalog,
@@ -220,7 +221,7 @@ db_create_media_record(B_DB *mdb, MEDIA_DBR *mr)
    char ed1[30], ed2[30], ed3[30];
 
    db_lock(mdb);
-   Mmsg(&mdb->cmd, "SELECT MediaId FROM Media WHERE VolumeName=\"%s\"", 
+   Mmsg(&mdb->cmd, "SELECT MediaId FROM Media WHERE VolumeName='%s'", 
           mr->VolumeName);
    Dmsg1(110, "selectpool: %s\n", mdb->cmd);
 
@@ -237,15 +238,16 @@ db_create_media_record(B_DB *mdb, MEDIA_DBR *mr)
 
    /* Must create it */
    Mmsg(&mdb->cmd, 
-"INSERT INTO Media (VolumeName, MediaType, PoolId, VolMaxBytes, VolCapacityBytes, \
-Recycle, VolRetention, VolStatus) VALUES (\"%s\", \"%s\", %d, %s, %s, %d, %s, \"%s\")", 
+"INSERT INTO Media (VolumeName,MediaType,PoolId,VolMaxBytes,VolCapacityBytes, \
+Recycle,VolRetention,VolStatus,Slot) VALUES ('%s', '%s', %d, %s, %s, %d, %s, '%s', %d)", 
                  mr->VolumeName,
                  mr->MediaType, mr->PoolId, 
                  edit_uint64(mr->VolMaxBytes,ed1),
                  edit_uint64(mr->VolCapacityBytes, ed2),
                  mr->Recycle,
                  edit_uint64(mr->VolRetention, ed3),
-                 mr->VolStatus);
+                 mr->VolStatus,
+                 mr->Slot);
 
    Dmsg1(500, "Create Volume: %s\n", mdb->cmd);
    if (!INSERT_DB(mdb, mdb->cmd)) {
@@ -274,7 +276,7 @@ int db_create_client_record(B_DB *mdb, CLIENT_DBR *cr)
    char ed1[30], ed2[30];
 
    db_lock(mdb);
-   Mmsg(&mdb->cmd, "SELECT ClientId FROM Client WHERE Name=\"%s\"", cr->Name);
+   Mmsg(&mdb->cmd, "SELECT ClientId,Uname FROM Client WHERE Name='%s'", cr->Name);
 
    cr->ClientId = 0;
    if (QUERY_DB(mdb, mdb->cmd)) {
@@ -284,16 +286,23 @@ int db_create_client_record(B_DB *mdb, CLIENT_DBR *cr)
       /* If more than one, report error, but return first row */
       if (mdb->num_rows > 1) {
          Mmsg1(&mdb->errmsg, _("More than one Client!: %d\n"), (int)(mdb->num_rows));
-        Emsg0(M_ERROR, 0, mdb->errmsg);
+         Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
       }
       if (mdb->num_rows >= 1) {
         if ((row = sql_fetch_row(mdb)) == NULL) {
             Mmsg1(&mdb->errmsg, _("error fetching Client row: %s\n"), sql_strerror(mdb));
+            Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
            sql_free_result(mdb);
            db_unlock(mdb);
            return 0;
         }
         cr->ClientId = atoi(row[0]);
+        if (row[1]) {
+           strncpy(cr->Uname, row[1], sizeof(cr->Uname)-2);
+           cr->Uname[sizeof(cr->Uname)-1] = 0;
+        } else {
+           cr->Uname[0] = 0;         /* no name */
+        }
         sql_free_result(mdb);
         db_unlock(mdb);
         return 1;
@@ -304,13 +313,14 @@ int db_create_client_record(B_DB *mdb, CLIENT_DBR *cr)
    /* Must create it */
    Mmsg(&mdb->cmd, "INSERT INTO Client (Name, Uname, AutoPrune, \
 FileRetention, JobRetention) VALUES \
-(\"%s\", \"%s\", %d, %s, %s)", cr->Name, cr->Uname, cr->AutoPrune,
+('%s', '%s', %d, %s, %s)", cr->Name, cr->Uname, cr->AutoPrune,
       edit_uint64(cr->FileRetention, ed1),
       edit_uint64(cr->JobRetention, ed2));
 
    if (!INSERT_DB(mdb, mdb->cmd)) {
       Mmsg2(&mdb->errmsg, _("Create DB Client record %s failed. ERR=%s\n"),
            mdb->cmd, sql_strerror(mdb));
+      Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
       cr->ClientId = 0;
       stat = 0;
    } else {
@@ -335,7 +345,7 @@ int db_create_fileset_record(B_DB *mdb, FILESET_DBR *fsr)
 
    db_lock(mdb);
    Mmsg(&mdb->cmd, "SELECT FileSetId FROM FileSet WHERE \
-FileSet=\"%s\" and MD5=\"%s\"", fsr->FileSet, fsr->MD5);
+FileSet='%s' and MD5='%s'", fsr->FileSet, fsr->MD5);
 
    fsr->FileSetId = 0;
    if (QUERY_DB(mdb, mdb->cmd)) {
@@ -344,11 +354,12 @@ FileSet=\"%s\" and MD5=\"%s\"", fsr->FileSet, fsr->MD5);
       
       if (mdb->num_rows > 1) {
          Mmsg1(&mdb->errmsg, _("More than one FileSet!: %d\n"), (int)(mdb->num_rows));
-        Emsg0(M_ERROR, 0, mdb->errmsg);
+         Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
       }
       if (mdb->num_rows >= 1) {
         if ((row = sql_fetch_row(mdb)) == NULL) {
             Mmsg1(&mdb->errmsg, _("error fetching FileSet row: ERR=%s\n"), sql_strerror(mdb));
+            Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
            sql_free_result(mdb);
            db_unlock(mdb);
            return 0;
@@ -363,11 +374,12 @@ FileSet=\"%s\" and MD5=\"%s\"", fsr->FileSet, fsr->MD5);
 
    /* Must create it */
    Mmsg(&mdb->cmd, "INSERT INTO FileSet (FileSet, MD5) VALUES \
-(\"%s\", \"%s\")", fsr->FileSet, fsr->MD5);
+('%s', '%s')", fsr->FileSet, fsr->MD5);
 
    if (!INSERT_DB(mdb, mdb->cmd)) {
       Mmsg2(&mdb->errmsg, _("Create DB FileSet record %s failed. ERR=%s\n"),
            mdb->cmd, sql_strerror(mdb));
+      Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
       fsr->FileSetId = 0;
       stat = 0;
    } else {
@@ -424,8 +436,9 @@ int db_create_file_attributes_record(B_DB *mdb, ATTR_DBR *ar)
    /* For the moment, we only handle Unix attributes.  Note, we are
     * also getting any MD5 signature that was computed.
     */
-   if (ar->Stream != STREAM_UNIX_ATTRIBUTES) {
+   if (!(ar->Stream == STREAM_UNIX_ATTRIBUTES || ar->Stream == STREAM_WIN32_ATTRIBUTES)) {
       Mmsg0(&mdb->errmsg, _("Attempt to put non-attributes into catalog\n"));
+      Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
       return 0;
    }
 
@@ -453,7 +466,7 @@ int db_create_file_attributes_record(B_DB *mdb, ATTR_DBR *ar)
     */
    fnl = p - l;
    if (fnl > 255) {
-      Emsg1(M_WARNING, 0, _("Filename truncated to 255 chars: %s\n"), l);
+      Jmsg(mdb->jcr, M_WARNING, 0, _("Filename truncated to 255 chars: %s\n"), l);
       fnl = 255;
    }
    if (fnl > 0) {
@@ -467,7 +480,7 @@ int db_create_file_attributes_record(B_DB *mdb, ATTR_DBR *ar)
 
    pnl = l - ar->fname;    
    if (pnl > 255) {
-      Emsg1(M_WARNING, 0, _("Path name truncated to 255 chars: %s\n"), ar->fname);
+      Jmsg(mdb->jcr, M_WARNING, 0, _("Path name truncated to 255 chars: %s\n"), ar->fname);
       pnl = 255;
    }
    strncpy(spath, ar->fname, pnl);
@@ -475,7 +488,7 @@ int db_create_file_attributes_record(B_DB *mdb, ATTR_DBR *ar)
 
    if (pnl == 0) {
       Mmsg1(&mdb->errmsg, _("Path length is zero. File=%s\n"), ar->fname);
-      Emsg0(M_ERROR, 0, mdb->errmsg);
+      Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
       spath[0] = ' ';
       spath[1] = 0;
       pnl = 1;
@@ -504,7 +517,6 @@ int db_create_file_attributes_record(B_DB *mdb, ATTR_DBR *ar)
    Dmsg0(50, "db_create_file_record\n");
 
    Dmsg3(100, "Path=%s File=%s FilenameId=%d\n", spath, file, ar->FilenameId);
-
    return 1;
 }
 
@@ -520,13 +532,14 @@ static int db_create_file_record(B_DB *mdb, ATTR_DBR *ar)
    /* Must create it */
    Mmsg(&mdb->cmd,
 "INSERT INTO File (FileIndex, JobId, PathId, FilenameId, \
-LStat, MD5) VALUES (%d, %d, %d, %d, \"%s\", \"0\")", 
-     (int)ar->FileIndex, ar->JobId, ar->PathId, ar->FilenameId, 
+LStat, MD5) VALUES (%u, %u, %u, %u, '%s', '0')", 
+      ar->FileIndex, ar->JobId, ar->PathId, ar->FilenameId, 
       ar->attr);
 
    if (!INSERT_DB(mdb, mdb->cmd)) {
       Mmsg2(&mdb->errmsg, _("Create db File record %s failed. ERR=%s"),       
         mdb->cmd, sql_strerror(mdb));
+      Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
       ar->FileId = 0;
       stat = 0;
    } else {
@@ -545,6 +558,7 @@ static int db_create_path_record(B_DB *mdb, ATTR_DBR *ar, char *path)
 
    if (*path == 0) {
       Mmsg0(&mdb->errmsg, _("Null path given to db_create_path_record\n"));
+      Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
       ar->PathId = 0;
       ASSERT(ar->PathId);
       return 0;
@@ -559,7 +573,7 @@ static int db_create_path_record(B_DB *mdb, ATTR_DBR *ar, char *path)
       return 1;
    }         
 
-   Mmsg(&mdb->cmd, "SELECT PathId FROM Path WHERE Path=\"%s\"", path);
+   Mmsg(&mdb->cmd, "SELECT PathId FROM Path WHERE Path='%s'", path);
 
    if (QUERY_DB(mdb, mdb->cmd)) {
 
@@ -569,13 +583,13 @@ static int db_create_path_record(B_DB *mdb, ATTR_DBR *ar, char *path)
         char ed1[30];
          Mmsg2(&mdb->errmsg, _("More than one Path!: %s for Path=%s\n"), 
            edit_uint64(mdb->num_rows, ed1), path);
-         Emsg1(M_ERROR, 0, "%s", mdb->errmsg);
-         Emsg1(M_ERROR, 0, "%s\n", mdb->cmd);
+         Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
       }
       if (mdb->num_rows >= 1) {
         if ((row = sql_fetch_row(mdb)) == NULL) {
            db_unlock(mdb);
             Mmsg1(&mdb->errmsg, _("error fetching row: %s\n"), sql_strerror(mdb));
+            Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
            sql_free_result(mdb);
            ar->PathId = 0;
            ASSERT(ar->PathId);
@@ -598,11 +612,12 @@ static int db_create_path_record(B_DB *mdb, ATTR_DBR *ar, char *path)
       sql_free_result(mdb);
    }
 
-   Mmsg(&mdb->cmd, "INSERT INTO Path (Path)  VALUES (\"%s\")", path);
+   Mmsg(&mdb->cmd, "INSERT INTO Path (Path)  VALUES ('%s')", path);
 
    if (!INSERT_DB(mdb, mdb->cmd)) {
       Mmsg2(&mdb->errmsg, _("Create db Path record %s failed. ERR=%s\n"), 
         mdb->cmd, sql_strerror(mdb));
+      Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
       ar->PathId = 0;
       stat = 0;
    } else {
@@ -628,20 +643,20 @@ static int db_create_filename_record(B_DB *mdb, ATTR_DBR *ar, char *fname)
    SQL_ROW row;
 
    db_lock(mdb);
-   Mmsg(&mdb->cmd, "SELECT FilenameId FROM Filename WHERE Name=\"%s\"", fname);
+   Mmsg(&mdb->cmd, "SELECT FilenameId FROM Filename WHERE Name='%s'", fname);
 
    if (QUERY_DB(mdb, mdb->cmd)) {
       mdb->num_rows = sql_num_rows(mdb);
       if (mdb->num_rows > 1) {
          Mmsg2(&mdb->errmsg, _("More than one Filename!: %d File=%s\n"), 
            (int)(mdb->num_rows), fname);
-         Emsg1(M_ERROR, 0, "%s", mdb->errmsg);
-         Emsg1(M_ERROR, 0, "%s\n", mdb->cmd);
+         Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
       }
       if (mdb->num_rows >= 1) {
         if ((row = sql_fetch_row(mdb)) == NULL) {
             Mmsg2(&mdb->errmsg, _("error fetching row for file=%s: ERR=%s\n"), 
                fname, sql_strerror(mdb));
+            Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
            ar->FilenameId = 0;
         } else {
            ar->FilenameId = atoi(row[0]);
@@ -654,11 +669,12 @@ static int db_create_filename_record(B_DB *mdb, ATTR_DBR *ar, char *fname)
    }
 
    Mmsg(&mdb->cmd, "INSERT INTO Filename (Name) \
-VALUES (\"%s\")", fname);
+VALUES ('%s')", fname);
 
    if (!INSERT_DB(mdb, mdb->cmd)) {
       Mmsg2(&mdb->errmsg, _("Create db Filename record %s failed. ERR=%s\n"), 
            mdb->cmd, sql_strerror(mdb));
+      Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
       ar->FilenameId = 0;
    } else {
       ar->FilenameId = sql_insert_id(mdb);