danil-bodry/iiko-connector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Danil Bodry
2026-05-07 18:17:00 +03:00
parent 1a5b10b129
commit 0b20b77690
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/su/xserver/iikocon/iiko/IikoHandler.java
View File

@@ -182,7 +182,7 @@ public class IikoHandler {
report_type_id INT AUTO_INCREMENT PRIMARY KEY,
name VARCHAR(50) UNIQUE NOT NULL,
description TEXT NOT NULL
) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
""";
String createFieldsCommon = """
@@ -196,7 +196,7 @@ public class IikoHandler {
aggregation_allowed BOOLEAN NOT NULL DEFAULT 0,
grouping_allowed BOOLEAN NOT NULL DEFAULT 0,
filtering_allowed BOOLEAN NOT NULL DEFAULT 0
) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
""";
String createReportTypeFields = """
@@ -206,14 +206,14 @@ public class IikoHandler {
PRIMARY KEY (report_type_id, field_id),
FOREIGN KEY (report_type_id) REFERENCES iiko_report_types(report_type_id) ON DELETE CASCADE,
FOREIGN KEY (field_id) REFERENCES iiko_fields_common(field_id) ON DELETE CASCADE
) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
""";
String createTags = """
CREATE TABLE IF NOT EXISTS iiko_tags (
tag_id INT AUTO_INCREMENT PRIMARY KEY,
tag_name VARCHAR(100) UNIQUE NOT NULL
) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
""";
String createFieldTags = """
@@ -223,7 +223,7 @@ public class IikoHandler {
PRIMARY KEY (field_id, tag_id),
FOREIGN KEY (field_id) REFERENCES iiko_fields_common(field_id) ON DELETE CASCADE,
FOREIGN KEY (tag_id) REFERENCES iiko_tags(tag_id) ON DELETE CASCADE
) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
""";
String idxKeyNormal = "CREATE INDEX IF NOT EXISTS idx_fields_common_key_normal ON iiko_fields_common(field_key_normal)";

4
src/main/java/su/xserver/iikocon/iiko/OlapQueryService.java
View File

@@ -40,7 +40,7 @@ public class OlapQueryService {
created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
updated TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
FOREIGN KEY (db_connection_id) REFERENCES external_database(id) ON DELETE RESTRICT
) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
""";
String createQueryRestaurantsTable = """
@@ -50,7 +50,7 @@ public class OlapQueryService {
PRIMARY KEY (query_id, restaurant_id),
FOREIGN KEY (query_id) REFERENCES olap_queries(id) ON DELETE CASCADE,
FOREIGN KEY (restaurant_id) REFERENCES restaurants(id) ON DELETE CASCADE
) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
""";
return pool.query(createQueriesTable).execute()

2
src/main/java/su/xserver/iikocon/service/ExternalDataBaseService.java
View File

@@ -114,7 +114,7 @@ public class ExternalDataBaseService {
password VARCHAR(255) NOT NULL,
created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
updated TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
)
) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
""";
return pool.query(createTable).execute().mapEmpty();
}

2
src/main/java/su/xserver/iikocon/service/RestaurantService.java
View File

@@ -49,7 +49,7 @@ public class RestaurantService {
https BOOLEAN DEFAULT FALSE,
created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
updated TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
)
) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
""";
return pool.query(createTable).execute().mapEmpty();
}

2
src/main/java/su/xserver/iikocon/service/SettingsService.java
View File

@@ -115,7 +115,7 @@ public class SettingsService {
CREATE TABLE IF NOT EXISTS app_settings (
setting_key VARCHAR(255) PRIMARY KEY,
setting_value TEXT
)
) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
""";
return pool.query(createTable).execute()
.compose(v -> setIfAbsent("site_name", "Admin Panel"))

2
src/main/java/su/xserver/iikocon/service/UserService.java
View File

@@ -31,7 +31,7 @@ public class UserService {
ip VARCHAR(45),
created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
updated TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
)
) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci
""";
return pool.query(createTable).execute().mapEmpty();
}