Fossil SCM
Fix [fab9f0047720721e] so that it works on repositories that do not have the tkt_ctime column in the TICKET table definition.
Commit
6476f287d381970040e56367c32a3083925a6a890c4bd1431b0b826cd411780d
Parent
ded2126db663be1…
1 file changed
+4
-2
+4
-2
| --- src/tkt.c | ||
| +++ src/tkt.c | ||
| @@ -188,17 +188,19 @@ | ||
| 188 | 188 | */ |
| 189 | 189 | static void initializeVariablesFromDb(void){ |
| 190 | 190 | const char *zName; |
| 191 | 191 | Stmt q; |
| 192 | 192 | int i, n, size, j; |
| 193 | + const char *zCTimeColumn = haveTicketCTime ? "tkt_ctime" : "tkt_mtime"; | |
| 193 | 194 | |
| 194 | 195 | zName = PD("name","-none-"); |
| 195 | 196 | db_prepare(&q, "SELECT datetime(tkt_mtime,toLocal()) AS tkt_datetime, " |
| 196 | - "datetime(tkt_ctime,toLocal()) AS tkt_datetime_creation, " | |
| 197 | + "datetime(%s,toLocal()) AS tkt_datetime_creation, " | |
| 197 | 198 | "julianday('now') - tkt_mtime, " |
| 198 | - "julianday('now') - tkt_ctime, *" | |
| 199 | + "julianday('now') - %s, *" | |
| 199 | 200 | " FROM ticket WHERE tkt_uuid GLOB '%q*'", |
| 201 | + zCTimeColumn/*safe-for-%s*/, zCTimeColumn/*safe-for-%s*/, | |
| 200 | 202 | zName); |
| 201 | 203 | if( db_step(&q)==SQLITE_ROW ){ |
| 202 | 204 | n = db_column_count(&q); |
| 203 | 205 | for(i=0; i<n; i++){ |
| 204 | 206 | const char *zVal = db_column_text(&q, i); |
| 205 | 207 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -188,17 +188,19 @@ | |
| 188 | */ |
| 189 | static void initializeVariablesFromDb(void){ |
| 190 | const char *zName; |
| 191 | Stmt q; |
| 192 | int i, n, size, j; |
| 193 | |
| 194 | zName = PD("name","-none-"); |
| 195 | db_prepare(&q, "SELECT datetime(tkt_mtime,toLocal()) AS tkt_datetime, " |
| 196 | "datetime(tkt_ctime,toLocal()) AS tkt_datetime_creation, " |
| 197 | "julianday('now') - tkt_mtime, " |
| 198 | "julianday('now') - tkt_ctime, *" |
| 199 | " FROM ticket WHERE tkt_uuid GLOB '%q*'", |
| 200 | zName); |
| 201 | if( db_step(&q)==SQLITE_ROW ){ |
| 202 | n = db_column_count(&q); |
| 203 | for(i=0; i<n; i++){ |
| 204 | const char *zVal = db_column_text(&q, i); |
| 205 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -188,17 +188,19 @@ | |
| 188 | */ |
| 189 | static void initializeVariablesFromDb(void){ |
| 190 | const char *zName; |
| 191 | Stmt q; |
| 192 | int i, n, size, j; |
| 193 | const char *zCTimeColumn = haveTicketCTime ? "tkt_ctime" : "tkt_mtime"; |
| 194 | |
| 195 | zName = PD("name","-none-"); |
| 196 | db_prepare(&q, "SELECT datetime(tkt_mtime,toLocal()) AS tkt_datetime, " |
| 197 | "datetime(%s,toLocal()) AS tkt_datetime_creation, " |
| 198 | "julianday('now') - tkt_mtime, " |
| 199 | "julianday('now') - %s, *" |
| 200 | " FROM ticket WHERE tkt_uuid GLOB '%q*'", |
| 201 | zCTimeColumn/*safe-for-%s*/, zCTimeColumn/*safe-for-%s*/, |
| 202 | zName); |
| 203 | if( db_step(&q)==SQLITE_ROW ){ |
| 204 | n = db_column_count(&q); |
| 205 | for(i=0; i<n; i++){ |
| 206 | const char *zVal = db_column_text(&q, i); |
| 207 |