Fossil SCM
Fix some compilation issues, related to merging.
Commit
2f07c443fbf8a94c55034ae3dc04d25e8786bde4
Parent
80aaef528d175d1…
1 file changed
+3
-3
+3
-3
| --- src/stash.c | ||
| +++ src/stash.c | ||
| @@ -491,14 +491,14 @@ | ||
| 491 | 491 | rc = db_exists("SELECT 1 FROM sqlite_master" |
| 492 | 492 | " WHERE name='stashfile'" |
| 493 | 493 | " AND sql GLOB '* PRIMARY KEY(origname, stashid)*'"); |
| 494 | 494 | if( rc!=0 ){ |
| 495 | 495 | db_multi_exec( |
| 496 | - "CREATE TABLE \"%w\".stashfile_tmp AS SELECT * FROM stashfile;" | |
| 497 | - "DROP TABLE stashfile;", zDb | |
| 496 | + "CREATE TABLE localdb.stashfile_tmp AS SELECT * FROM stashfile;" | |
| 497 | + "DROP TABLE stashfile;" | |
| 498 | 498 | ); |
| 499 | - db_multi_exec(zStashInit /*works-like:"%w,%w"*/, zDb, zDb); | |
| 499 | + db_multi_exec(zStashInit /*works-like:""*/); | |
| 500 | 500 | db_multi_exec( |
| 501 | 501 | "INSERT INTO stashfile SELECT * FROM stashfile_tmp;" |
| 502 | 502 | "DROP TABLE stashfile_tmp;" |
| 503 | 503 | ); |
| 504 | 504 | } |
| 505 | 505 |
| --- src/stash.c | |
| +++ src/stash.c | |
| @@ -491,14 +491,14 @@ | |
| 491 | rc = db_exists("SELECT 1 FROM sqlite_master" |
| 492 | " WHERE name='stashfile'" |
| 493 | " AND sql GLOB '* PRIMARY KEY(origname, stashid)*'"); |
| 494 | if( rc!=0 ){ |
| 495 | db_multi_exec( |
| 496 | "CREATE TABLE \"%w\".stashfile_tmp AS SELECT * FROM stashfile;" |
| 497 | "DROP TABLE stashfile;", zDb |
| 498 | ); |
| 499 | db_multi_exec(zStashInit /*works-like:"%w,%w"*/, zDb, zDb); |
| 500 | db_multi_exec( |
| 501 | "INSERT INTO stashfile SELECT * FROM stashfile_tmp;" |
| 502 | "DROP TABLE stashfile_tmp;" |
| 503 | ); |
| 504 | } |
| 505 |
| --- src/stash.c | |
| +++ src/stash.c | |
| @@ -491,14 +491,14 @@ | |
| 491 | rc = db_exists("SELECT 1 FROM sqlite_master" |
| 492 | " WHERE name='stashfile'" |
| 493 | " AND sql GLOB '* PRIMARY KEY(origname, stashid)*'"); |
| 494 | if( rc!=0 ){ |
| 495 | db_multi_exec( |
| 496 | "CREATE TABLE localdb.stashfile_tmp AS SELECT * FROM stashfile;" |
| 497 | "DROP TABLE stashfile;" |
| 498 | ); |
| 499 | db_multi_exec(zStashInit /*works-like:""*/); |
| 500 | db_multi_exec( |
| 501 | "INSERT INTO stashfile SELECT * FROM stashfile_tmp;" |
| 502 | "DROP TABLE stashfile_tmp;" |
| 503 | ); |
| 504 | } |
| 505 |