Comparison

mod_storage_sql: Handle SQLite DELETE with LIMIT being optional (fixes #1359)

comparison

equal deleted inserted replaced

-:2408e6362c15
+:acf4a7bfb6aa
 				WHERE %s
 				ORDER BY "sort_id" %s
 				LIMIT %s OFFSET ?
 			);]];
 			if engine.params.driver == "SQLite3" then
-				sql_query = [[
+				if engine._have_delete_limit then
-				DELETE FROM "prosodyarchive"
+					sql_query = [[
-				WHERE %s
+					DELETE FROM "prosodyarchive"
-				ORDER BY "sort_id" %s
+					WHERE %s
-				LIMIT %s OFFSET ?;
+					ORDER BY "sort_id" %s
-				]];
+					LIMIT %s OFFSET ?;
+					]];
+				end
 				unlimited = "-1";
 			elseif engine.params.driver == "MySQL" then
 				sql_query = [[
 				DELETE result FROM prosodyarchive AS result JOIN (
 					SELECT sort_id FROM prosodyarchive
 				-- Check whether the table needs upgrading
 				if upgrade_table(engine, params, false) then
 					module:log("error", "Old database format detected. Please run: prosodyctl mod_%s upgrade", module.name);
 					return false, "database upgrade needed";
 				end
+				if engine.params.driver == "SQLite3" then
+					for row in engine:select("PRAGMA compile_options") do
+						if row[1] == "ENABLE_UPDATE_DELETE_LIMIT" then
+							engine._have_delete_limit = true;
+						end
+					end
+				end
 			end
 		end);
 		engines[sql.db2uri(params)] = engine;
 	end