Merge branch 'master' into textarea-refactor

This commit is contained in:
Alexander Minkin 2023-09-23 15:13:44 +03:00
commit 0bfcadcde7
Signed by untrusted user: WerySkok
GPG key ID: 88E9A2F3AFE44C30
27 changed files with 18 additions and 18 deletions

View file

@ -18,5 +18,6 @@ RUN apt update; \
yaml \
pdo_mysql \
rdkafka \
imagick \
&& \
rm -rf /var/lib/apt/lists/*

View file

@ -76,6 +76,7 @@ services:
- KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092
- KAFKA_BROKER_ID=1
- KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=1@127.0.0.1:9093
- KAFKA_CFG_NODE_ID=1
phpmyadmin:
image: docker.io/phpmyadmin:5

View file

@ -1 +1,7 @@
CREATE TABLE `support_names` ( `agent` BIGINT UNSIGNED NOT NULL , `name` VARCHAR(512) NOT NULL , `icon` VARCHAR(1024) NULL DEFAULT NULL , `numerate` BOOLEAN NOT NULL DEFAULT FALSE , PRIMARY KEY (`agent`)) ENGINE = InnoDB;
CREATE TABLE `support_names` (
`agent` BIGINT UNSIGNED NOT NULL,
`name` VARCHAR(512) NOT NULL,
`icon` VARCHAR(1024) NULL DEFAULT NULL,
`numerate` BOOLEAN NOT NULL DEFAULT FALSE,
PRIMARY KEY (`agent`)
) ENGINE = InnoDB;

View file

@ -1,15 +0,0 @@
CREATE TABLE `support_names` (
`id` bigint(20) UNSIGNED NOT NULL,
`agent` bigint(20) UNSIGNED NOT NULL,
`name` varchar(512) COLLATE utf8mb4_unicode_ci NOT NULL,
`icon` varchar(1024) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`numerate` tinyint(1) NOT NULL DEFAULT 0
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
ALTER TABLE `support_names`
ADD PRIMARY KEY (`id`);
ALTER TABLE `support_names`
MODIFY `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT;
COMMIT;

View file

@ -0,0 +1,9 @@
ALTER TABLE `support_names` ADD `id` bigint(20) UNSIGNED NOT NULL FIRST;
ALTER TABLE `support_names`
ADD UNIQUE KEY `id` (`id`);
ALTER TABLE `support_names`
MODIFY `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT;
COMMIT;

View file

@ -1,2 +0,0 @@
ALTER TABLE `support_names`
ADD COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT UNIQUE FIRST;