Diff
Not logged in

Differences From:

File src/db.c part of check-in [1e9c0e287e] - Test commands for importing and exporting ticket configurations. by drh on 2007-10-03 12:20:00. [view]

To:

File src/db.c part of check-in [3cdb768fca] - Do not attempt to access the global_config table if the ~/.fossil database has not been opened. by drh on 2007-10-06 16:40:48. [view]

@@ -838,9 +838,9 @@
   char *z = 0;
   if( g.repositoryOpen ){
     z = db_text(0, "SELECT value FROM config WHERE name=%Q", zName);
   }
-  if( z==0 ){
+  if( z==0 && g.configOpen ){
     z = db_text(0, "SELECT value FROM global_config WHERE name=%Q", zName);
   }
   if( z==0 ){
     z = zDefault;
@@ -856,9 +856,13 @@
   }
   db_end_transaction(0);
 }
 int db_is_global(const char *zName){
-  return db_exists("SELECT 1 FROM global_config WHERE name=%Q", zName);
+  if( g.configOpen ){
+    return db_exists("SELECT 1 FROM global_config WHERE name=%Q", zName);
+  }else{
+    return 0;
+  }
 }
 int db_get_int(const char *zName, int dflt){
   int v;
   int rc;
@@ -872,9 +876,9 @@
     db_finalize(&q);
   }else{
     rc = SQLITE_DONE;
   }
-  if( rc==SQLITE_DONE ){
+  if( rc==SQLITE_DONE && g.configOpen ){
     v = db_int(dflt, "SELECT value FROM global_config WHERE name=%Q", zName);
   }
   return v;
 }