Dalsich par zmen

db_compare.py

@@ -456,7 +456,8 @@ def check_res_clanek():
 	JOIN seminar_problemy AS problem ON problem_ptr_id = problem.id
 	INNER JOIN seminar_hodnoceni AS hodn ON problem.id = hodn.problem_id
 	INNER JOIN seminar_reseni AS rese ON rese.id = hodn.reseni_id
-	INNER JOIN seminar_nodes_treenode AS tn ON rese.text_cely_id = tn.id
+	INNER JOIN seminar_nodes_otistene_reseni AS rn ON rese.text_cely_id = rn.treenode_ptr_id -- Tenhle radek neni potreba, ale ujistuje se mj. o spravnem typu TreeNode.
+	INNER JOIN seminar_nodes_treenode AS tn ON rn.treenode_ptr_id = tn.id
 	-- Nektere clanky vubec nemely text, tak jim migr 0058 nevyrobila dalsi treenody
 	LEFT OUTER JOIN seminar_nodes_obsah AS son ON son.treenode_ptr_id = tn.first_child_id
 	LEFT OUTER JOIN seminar_texty AS text ON text.id = son.text_id
@@ -477,6 +478,7 @@ def check_res_clanek():
 		if n['text_zadani'] is None:
 			n['text_zadani'] = ''
 		check_same(o,n, old_fields, new_fields)
+		assert(o['text_reseni'] == '')
 
 def check_untyped_problem():
 	old_query = "SELECT * FROM seminar_problemy WHERE typ NOT IN ('uloha', 'tema', 'serial', 'konfera', 'org-clanek', 'res-clanek')"