dissect.database 1.1.dev4__tar.gz → 1.1.dev5__tar.gz

{dissect_database-1.1.dev4/dissect.database.egg-info → dissect_database-1.1.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.database
-Version: 1.1.dev4
+Version: 1.1.dev5
 Summary: A Dissect module implementing parsers for various database formats, including Berkeley DB, Microsofts Extensible Storage Engine (ESE) and SQLite3
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: Apache-2.0

{dissect_database-1.1.dev4 → dissect_database-1.1.dev5}/dissect/database/sqlite3/util.py

@@ -134,11 +134,9 @@ def get_primary_key_from_constraint(column_type_constraint: str, column_def: str
         )
     matched_group = primary_key_sql.groups()[0]
     primary_key_defs = list(split_sql_list(matched_group))
-    # We only handle single primary keys, no compound keys or
-    # expressions, so a single entry in the list consisting of a single
-    # part.
+    # We only handle single primary keys, no compound keys or expressions, so a single entry in the list consisting of
+    # a single part. For example we parse ``id`` as a primary_key in the constraint ``PRIMARY KEY("id" AUTOINCREMENT)``.
     if len(primary_key_defs) == 1:
         primary_key_parts = primary_key_defs[0].split(maxsplit=1)
-        if len(primary_key_parts) == 1:
-            primary_key = primary_key_parts[0]
+        primary_key = primary_key_parts[0].strip("'\"")
     return primary_key

{dissect_database-1.1.dev4 → dissect_database-1.1.dev5/dissect.database.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.database
-Version: 1.1.dev4
+Version: 1.1.dev5
 Summary: A Dissect module implementing parsers for various database formats, including Berkeley DB, Microsofts Extensible Storage Engine (ESE) and SQLite3
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: Apache-2.0

{dissect_database-1.1.dev4 → dissect_database-1.1.dev5}/tests/sqlite3/test_util.py

@@ -155,6 +155,21 @@ testdata = [
         ),
         id="create-table-firefox-foreign-in-column-name",
     ),
+    # Primary key constraint with multiple parts, but not a compound/composite constraint.
+    pytest.param(
+        'CREATE TABLE "example"("foo" INTEGER, "bar" TEXT NOT NULL, PRIMARY KEY("foo" AUTOINCREMENT))',
+        (
+            "foo",
+            [
+                ("foo", "INTEGER"),
+                ("bar", "TEXT NOT NULL"),
+            ],
+            [
+                'PRIMARY KEY("foo" AUTOINCREMENT)',
+            ],
+        ),
+        id="primary-key-constraint-multiple-parts",
+    ),
 ]