From 709f4f2798d0490ae048094536bed7e973ea29f4 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Wed, 6 Dec 2017 20:54:25 -0800 Subject: [PATCH] Fixed bug with detecting FTS tables Closes #135 --- datasette/utils.py | 2 +- tests/test_utils.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/datasette/utils.py b/datasette/utils.py index 6d7ac147..dc4055c0 100644 --- a/datasette/utils.py +++ b/datasette/utils.py @@ -300,7 +300,7 @@ def detect_fts_sql(table): sql like '%VIRTUAL TABLE%USING FTS%content="{table}"%' or ( tbl_name = "{table}" - and sql not like 'CREATE VIEW%' + and sql like '%VIRTUAL TABLE%USING FTS%' ) ) '''.format(table=table) diff --git a/tests/test_utils.py b/tests/test_utils.py index 8fe1855e..7f7a472d 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -147,11 +147,13 @@ def test_detect_fts(): ); CREATE VIEW Test_View AS SELECT * FROM Dumb_Table; CREATE VIRTUAL TABLE "Street_Tree_List_fts" USING FTS4 ("qAddress", "qCaretaker", "qSpecies", content="Street_Tree_List"); + CREATE VIRTUAL TABLE r USING rtree(a, b, c); ''' conn = sqlite3.connect(':memory:') conn.executescript(sql) assert None is utils.detect_fts(conn, 'Dumb_Table') assert None is utils.detect_fts(conn, 'Test_View') + assert None is utils.detect_fts(conn, 'r') assert 'Street_Tree_List_fts' == utils.detect_fts(conn, 'Street_Tree_List')