Fossil

Check-in [0b6d3eaf]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix another SQL error on the receiver side of "fossil config pull"
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256:0b6d3eaf6cc3e221580d2f9ad95b7e045b7cc1d32bd376f883e4aca3af07b590
User & Date: drh 2018-06-25 18:20:34
Context
2018-06-25
18:43
Fix an extra call to db_end_transaction() in "fossil config pull ticket". check-in: f5eb03f5 user: drh tags: trunk
18:20
Fix another SQL error on the receiver side of "fossil config pull" check-in: 0b6d3eaf user: drh tags: trunk
18:17
Fix a syntax error in the SQL of the "config pull" mechanism. check-in: 4e699c29 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/configure.c.

   422    422         blob_append_sql(&sql, "INSERT OR IGNORE INTO ");
   423    423       }
   424    424       blob_append_sql(&sql, "\"%w\"(\"%w\",mtime",
   425    425            &zName[1], aType[ii].zPrimKey);
   426    426       for(jj=2; jj<nToken; jj+=2){
   427    427          blob_append_sql(&sql, ",\"%w\"", azToken[jj]);
   428    428       }
   429         -    blob_append_sql(&sql,") VALUES(%s",
   430         -       azToken[1] /*safe-for-%s*/);
          429  +    blob_append_sql(&sql,") VALUES(%s,%s",
          430  +       azToken[1] /*safe-for-%s*/, azToken[0]/*safe-for-%s*/);
   431    431       for(jj=2; jj<nToken; jj+=2){
   432    432          blob_append_sql(&sql, ",%s", azToken[jj+1] /*safe-for-%s*/);
   433    433       }
   434    434       db_multi_exec("%s)", blob_sql_text(&sql));
   435    435       if( db_changes()==0 ){
   436    436         blob_reset(&sql);
   437    437         blob_append_sql(&sql, "UPDATE \"%w\" SET mtime=%s",