sqlite improvements

diff --git a/magic/Magdir/database b/magic/Magdir/database
index b2f68d98a7c0601692cf1db841b68ce8d0f9cee5..aef8469cc12edee3735e78a0b7f7c11a766631ba 100644 (file)
--- a/magic/Magdir/database
+++ b/magic/Magdir/database
@@ -210,7 +210,3 @@
 16     string          MIT-MAGIC-COOKIE-1      X11 Xauthority data
 17     string          MIT-MAGIC-COOKIE-1      X11 Xauthority data
 18     string          MIT-MAGIC-COOKIE-1      X11 Xauthority data
-
-# SQLite (Ty Sarna)
-0      string  **\ This\ file\ contains\ an\ SQLite    SQLite Database
->&1    regex   [^\ ]+                                  Version %s

diff --git a/magic/Magdir/sql b/magic/Magdir/sql
index 016e030b3ceeb51cb32e1d76a0cac1b4ef00d766..21c6e515e94554a2da3ef4a5b5ee1707c7f97053 100644 (file)
--- a/magic/Magdir/sql
+++ b/magic/Magdir/sql
@@ -27,8 +27,19 @@
 >39  string            iHP-100 [H Series]
 
 #------------------------------------------------------------------------------
-# SQLite database file 
-# From Ken Guest <ken@linux.ie>
+# SQLite database files
+# Ken Guest <ken@linux.ie>, Ty Sarna, Zack Weinberg
+#
+# Version 1 used GDBM internally; its files cannot be distinguished
+# from other GDBM files.
 #
-0   string  SQLite  SQLite database
->14 string >\0  (Version %s)
+# Version 2 used this format:
+0      string  **\ This\ file\ contains\ an\ SQLite  SQLite 2.x database
+
+# Version 3 of SQLite allows applications to embed their own "user version"
+# number in the database.  Detect this and distinguish those files.
+
+0   string  SQLite\ format\ 3
+>60 string  _MTN               Monotone source repository
+>60 belong  !0                 SQLite 3.x database, user version %u
+>60 belong  0                  SQLite 3.x database