===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.106
retrieving revision 1.109
diff -u -p -r1.106 -r1.109
--- mandoc/mandocdb.c	2014/01/06 15:32:47	1.106
+++ mandoc/mandocdb.c	2014/01/18 08:21:03	1.109
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.106 2014/01/06 15:32:47 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.109 2014/01/18 08:21:03 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -969,6 +969,9 @@ mpages_merge(struct mchars *mc, struct mparse *mp)
 	str_info.hfree = hash_free;
 	str_info.key_offset = offsetof(struct str, key);
 
+	if (0 == nodb)
+		SQL_EXEC("BEGIN TRANSACTION");
+
 	mpage = ohash_first(&mpages, &pslot);
 	while (NULL != mpage) {
 		mlinks_undupe(mpage);
@@ -1059,6 +1062,9 @@ mpages_merge(struct mchars *mc, struct mparse *mp)
 		ohash_delete(&strings);
 		mpage = ohash_next(&mpages, &pslot);
 	}
+
+	if (0 == nodb)
+		SQL_EXEC("END TRANSACTION");
 }
 
 static void
@@ -1754,8 +1760,6 @@ dbadd(const struct mpage *mpage, struct mchars *mc)
 	if (nodb)
 		return;
 
-	SQL_EXEC("BEGIN TRANSACTION");
-
 	i = 1;
 	SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, FORM_SRC == mpage->form);
 	SQL_STEP(stmts[STMT_INSERT_PAGE]);
@@ -1787,8 +1791,6 @@ dbadd(const struct mpage *mpage, struct mchars *mc)
 			free(key->rendered);
 		free(key);
 	}
-
-	SQL_EXEC("END TRANSACTION");
 }
 
 static void
@@ -1912,19 +1914,15 @@ dbopen(int real)
 	      " \"arch\" TEXT NOT NULL,\n"
 	      " \"name\" TEXT NOT NULL,\n"
 	      " \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) "
-		"ON DELETE CASCADE,\n"
-	      " \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n"
+		"ON DELETE CASCADE\n"
 	      ");\n"
 	      "\n"
 	      "CREATE TABLE \"keys\" (\n"
 	      " \"bits\" INTEGER NOT NULL,\n"
 	      " \"key\" TEXT NOT NULL,\n"
 	      " \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) "
-		"ON DELETE CASCADE,\n"
-	      " \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n"
-	      ");\n"
-	      "\n"
-	      "CREATE INDEX \"key_index\" ON keys (key);\n";
+		"ON DELETE CASCADE\n"
+	      ");\n";
 
 	if (SQLITE_OK != sqlite3_exec(db, sql, NULL, NULL, NULL)) {
 		exitcode = (int)MANDOCLEVEL_SYSERR;