Series import: add basic support for countries aliases.

Fix #697

Author: php-coder

src/main/resources/liquibase/version/0.4.xml

@@ -36,5 +36,6 @@
 	<include file="0.4/2017-11-09--series_import_requests_url_length.xml" relativeToChangelogFile="true" />
 	<include file="0.4/2017-11-09--series_import_parsed_data_release_year_field.xml" relativeToChangelogFile="true" />
 	<include file="0.4/2017-11-09--categories_aliases.xml" relativeToChangelogFile="true" />
+	<include file="0.4/2017-11-09--countries_aliases.xml" relativeToChangelogFile="true" />
 
 </databaseChangeLog>

src/main/resources/liquibase/version/0.4/2017-11-09--countries_aliases.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+		xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+		http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.0.xsd">
+	
+	<changeSet id="create-countries_aliases-table" author="php-coder" context="scheme">
+		
+		<createTable tableName="countries_aliases">
+			<column name="country_id" type="INTEGER">
+				<constraints
+					nullable="false"
+					references="countries(id)"
+					foreignKeyName="fk_countries_aliases_country_id" />
+			</column>
+			<column name="name" type="VARCHAR(50)">
+				<constraints
+					unique="true"
+					uniqueConstraintName="uc_countries_aliases_name" />
+			</column>
+			<column name="name_ru" type="VARCHAR(50)">
+				<constraints
+					unique="true"
+					uniqueConstraintName="uc_countries_aliases_name_ru" />
+			</column>
+		</createTable>
+		
+	</changeSet>
+	
+</databaseChangeLog>

src/main/resources/sql/country_dao_queries.properties

@@ -67,11 +67,15 @@ LEFT JOIN countries c \
     WHERE cs.collection_id = :collection_id \
  GROUP BY s.country_id
 
-country.find_ids_by_names = \
-SELECT id \
-  FROM countries \
- WHERE name IN (:names) \
-    OR name_ru IN (:names)
+category.find_ids_by_names = \
+   SELECT c.id \
+     FROM countries c \
+LEFT JOIN countries_aliases ca \
+       ON ca.country_id = c.id \
+    WHERE c.name IN (:names) \
+       OR c.name_ru IN (:names) \
+       OR ca.name IN (:names) \
+       OR ca.name_ru IN (:names)
 
 country.find_ids_by_name_pattern = \
 SELECT id \