-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix issue in Join stements with prefix specified for package gdb (gog…
- Loading branch information
Showing
15 changed files
with
340 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
|
|
||
|
|
||
| DROP TABLE IF EXISTS `common_resource`; | ||
| /*!40101 SET @saved_cs_client = @@character_set_client */; | ||
| /*!50503 SET character_set_client = utf8mb4 */; | ||
| CREATE TABLE `common_resource` ( | ||
| `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, | ||
| `app_id` bigint(20) NOT NULL, | ||
| `resource_id` varchar(64) NOT NULL, | ||
| `src_instance_id` varchar(64) DEFAULT NULL, | ||
| `region` varchar(36) DEFAULT NULL, | ||
| `zone` varchar(36) DEFAULT NULL, | ||
| `database_kind` varchar(20) NOT NULL, | ||
| `source_type` varchar(64) NOT NULL, | ||
| `ip` varchar(64) DEFAULT NULL, | ||
| `port` int(10) DEFAULT NULL, | ||
| `vpc_id` varchar(20) DEFAULT NULL, | ||
| `subnet_id` varchar(20) DEFAULT NULL, | ||
| `proxy_ip` varchar(64) DEFAULT NULL, | ||
| `proxy_port` int(10) DEFAULT NULL, | ||
| `proxy_id` bigint(20) DEFAULT NULL, | ||
| `proxy_snat_ip` varchar(64) DEFAULT NULL, | ||
| `lease_at` timestamp NULL DEFAULT NULL, | ||
| `uin` varchar(32) NOT NULL, | ||
| PRIMARY KEY (`id`), | ||
| UNIQUE KEY `unique_resource` (`app_id`,`src_instance_id`,`vpc_id`,`subnet_id`,`ip`,`port`), | ||
| KEY `resource_id` (`resource_id`) | ||
| ) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8mb4 COMMENT='资源公共信息表'; | ||
| /*!40101 SET character_set_client = @saved_cs_client */; | ||
|
|
||
| -- | ||
| -- Dumping data for table `common_resource` | ||
| -- | ||
|
|
||
| LOCK TABLES `common_resource` WRITE; | ||
| /*!40000 ALTER TABLE `common_resource` DISABLE KEYS */; | ||
| INSERT INTO `common_resource` VALUES (1,1,'2','2','2','3','1','1','1',1,'1','1','1',1,1,'1',NULL,''),(3,2,'3','3','3','3','3','3','3',3,'3','3','3',3,3,'3',NULL,''),(18,1303697168,'dmc-rgnh9qre','vdb-6b6m3u1u','ap-guangzhou','','vdb','cloud','10.0.1.16',80,'vpc-m3dchft7','subnet-9as3a3z2','9.27.72.189',11131,228476,'169.254.128.5, ','2023-11-08 08:13:04',''),(20,1303697168,'dmc-4grzi4jg','tdsqlshard-313spncx','ap-guangzhou','','tdsql','cloud','10.255.0.27',3306,'vpc-407k0e8x','subnet-qhkkk3bo','30.86.239.200',24087,0,'',NULL,''); | ||
| /*!40000 ALTER TABLE `common_resource` ENABLE KEYS */; | ||
| UNLOCK TABLES; | ||
|
|
||
| -- | ||
| -- Table structure for table `managed_resource` | ||
| -- | ||
|
|
||
| DROP TABLE IF EXISTS `managed_resource`; | ||
| /*!40101 SET @saved_cs_client = @@character_set_client */; | ||
| /*!50503 SET character_set_client = utf8mb4 */; | ||
| CREATE TABLE `managed_resource` ( | ||
| `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, | ||
| `instance_id` varchar(64) NOT NULL, | ||
| `resource_id` varchar(64) NOT NULL, | ||
| `resource_name` varchar(64) DEFAULT NULL, | ||
| `status` varchar(36) NOT NULL DEFAULT 'valid', | ||
| `status_message` varchar(64) DEFAULT NULL, | ||
| `user` varchar(64) NOT NULL, | ||
| `password` varchar(1024) NOT NULL, | ||
| `pay_mode` tinyint(1) DEFAULT '0', | ||
| `safe_publication` bit(1) DEFAULT b'0', | ||
| `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, | ||
| `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, | ||
| `expired_at` timestamp NULL DEFAULT NULL, | ||
| `deleted` tinyint(1) NOT NULL DEFAULT '0', | ||
| `resource_mark_id` int(11) DEFAULT NULL, | ||
| `comments` varchar(64) DEFAULT NULL, | ||
| `rule_template_id` varchar(64) NOT NULL, | ||
| PRIMARY KEY (`id`), | ||
| UNIQUE KEY `resource_id` (`resource_id`), | ||
| KEY `instance_id` (`instance_id`) | ||
| ) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COMMENT='管控实例表'; | ||
| /*!40101 SET character_set_client = @saved_cs_client */; | ||
|
|
||
| -- | ||
| -- Dumping data for table `managed_resource` | ||
| -- | ||
|
|
||
| LOCK TABLES `managed_resource` WRITE; | ||
| /*!40000 ALTER TABLE `managed_resource` DISABLE KEYS */; | ||
| INSERT INTO `managed_resource` VALUES (1,'2','3','1','1','1','1','1',1,_binary '','2023-11-06 12:14:21','2023-11-06 12:14:21',NULL,1,1,'1',''),(2,'3','2','1','1','1','1','1',1,_binary '\0','2023-11-06 12:15:07','2023-11-06 12:15:07',NULL,1,2,'1',''),(5,'dmcins-jxy0x75m','dmc-rgnh9qre','erichmao-vdb-test','invalid','The Ip field is required','root','2e39af3dd1d447e2b1437b40c62c35995fa22b370c7455ff7815dace3a6e8891ccadcfc893fe1342a4102d742bd7a3e603cd0ac1fcdc072d7c0b5be5836ec87306981b629f9b59aedf0316e9504ab172fa1c95756d5b260114e4feaa0b19223fb61cb268cc4818307ed193dbab830cf556b91cde182686eb70f70ea77f69eff66230dec2ce92bd3352cad31abf47597a5cc6a0d638381dc3bae7aa1b142730790a6d4cefdef1bd460061c966ad5008c2b5fc971b7f4d7dddffa5b1456c45e2917763dd8fffb1fa7fc4783feca95dafc9a9f4edf21b0579f76b0a3154f087e3b9a7fc49af8ff92b12e7b03caa865e72e777dd9d35a11910df0d55ead90e47d5f8',1,_binary '','2023-11-08 08:13:20','2023-11-09 05:31:07',NULL,0,11,NULL,'12345'),(6,'dmcins-erxms6ya','dmc-4grzi4jg','erichmao-vdb-test','invalid','The Ip field is required','leotaowang','641d846cf75bc7944202251d97dca8335f7f149dd4fd911ca5b87c71ef1dc5d0a66c4e5021ef7ad53136cda2fb2567d34e3dd1a7666e3f64ebf532eb2a55d84952aac86b4211f563f7b9da7dd0f88ec288d6680d3513cea0c1b7ad7babb474717f77ebbc9d63bb458adaf982887da9e63df957ffda572c1c3ed187471b99fdc640b45fed76a6d50dc1090eee79b4d94d056c4d43416133481f55bd040759398680104a84d801e6475dcfe919a00859908296747430b728a00c8d54256ae220235a138e0bbf08fe8b6fc8589971436b55bff966154721a91adbdc9c2b6f50ef5849ed77e5b028116abac51584b8d401cd3a88d18df127006358ed33fc3fa6f480',1,_binary '','2023-11-08 22:15:17','2023-11-09 05:31:07',NULL,0,11,NULL,'12345'); | ||
| /*!40000 ALTER TABLE `managed_resource` ENABLE KEYS */; | ||
| UNLOCK TABLES; | ||
|
|
||
| -- | ||
| -- Table structure for table `rules_template` | ||
| -- | ||
|
|
||
| DROP TABLE IF EXISTS `rules_template`; | ||
| /*!40101 SET @saved_cs_client = @@character_set_client */; | ||
| /*!50503 SET character_set_client = utf8mb4 */; | ||
| CREATE TABLE `rules_template` ( | ||
| `id` bigint(20) NOT NULL AUTO_INCREMENT, | ||
| `app_id` bigint(20) DEFAULT NULL, | ||
| `name` varchar(255) NOT NULL, | ||
| `database_kind` varchar(64) DEFAULT NULL, | ||
| `is_default` tinyint(1) NOT NULL DEFAULT '0', | ||
| `win_rules` varchar(2048) DEFAULT NULL, | ||
| `inception_rules` varchar(2048) DEFAULT NULL, | ||
| `auto_exec_rules` varchar(2048) DEFAULT NULL, | ||
| `order_check_step` varchar(2048) DEFAULT NULL, | ||
| `template_id` varchar(64) NOT NULL DEFAULT '', | ||
| `version` int(11) NOT NULL DEFAULT '1', | ||
| `deleted` tinyint(1) NOT NULL DEFAULT '0', | ||
| `create_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, | ||
| `update_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, | ||
| `is_system` tinyint(1) NOT NULL DEFAULT '0', | ||
| `uin` varchar(64) DEFAULT NULL, | ||
| `subAccountUin` varchar(64) DEFAULT NULL, | ||
| PRIMARY KEY (`id`), | ||
| UNIQUE KEY `uniq_template_id` (`template_id`), | ||
| UNIQUE KEY `uniq_name` (`name`,`app_id`,`deleted`,`uin`) USING BTREE | ||
| ) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4; | ||
| /*!40101 SET character_set_client = @saved_cs_client */; | ||
|
|
||
| -- | ||
| -- Dumping data for table `rules_template` | ||
| -- | ||
|
|
||
| LOCK TABLES `rules_template` WRITE; | ||
| /*!40000 ALTER TABLE `rules_template` DISABLE KEYS */; | ||
| /*!40000 ALTER TABLE `rules_template` ENABLE KEYS */; | ||
| UNLOCK TABLES; | ||
|
|
||
| -- | ||
| -- Table structure for table `resource_mark` | ||
| -- | ||
|
|
||
| DROP TABLE IF EXISTS `resource_mark`; | ||
| /*!40101 SET @saved_cs_client = @@character_set_client */; | ||
| /*!50503 SET character_set_client = utf8mb4 */; | ||
| CREATE TABLE `resource_mark` ( | ||
| `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, | ||
| `app_id` bigint(20) NOT NULL, | ||
| `mark_name` varchar(64) NOT NULL, | ||
| `color` varchar(11) NOT NULL, | ||
| `creator` varchar(32) NOT NULL, | ||
| `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, | ||
| `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, | ||
| PRIMARY KEY (`id`), | ||
| UNIQUE KEY `app_id_name` (`app_id`,`mark_name`) | ||
| ) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8 COMMENT='标签信息表'; | ||
| /*!40101 SET character_set_client = @saved_cs_client */; | ||
|
|
||
| -- | ||
| -- Dumping data for table `resource_mark` | ||
| -- | ||
|
|
||
| LOCK TABLES `resource_mark` WRITE; | ||
| /*!40000 ALTER TABLE `resource_mark` DISABLE KEYS */; | ||
| INSERT INTO `resource_mark` VALUES (10,1,'test','red','1','2023-11-06 02:45:46','2023-11-06 02:45:46'); | ||
| /*!40000 ALTER TABLE `resource_mark` ENABLE KEYS */; | ||
| UNLOCK TABLES; | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| SELECT managed_resource.resource_id,managed_resource.user,managed_resource.status,managed_resource.status_message,managed_resource.safe_publication,managed_resource.rule_template_id,managed_resource.created_at,managed_resource.comments,managed_resource.expired_at,managed_resource.resource_mark_id,managed_resource.instance_id,managed_resource.resource_name,managed_resource.pay_mode,resource_mark.mark_name,resource_mark.color,rules_template.name,common_resource.src_instance_id,common_resource.database_kind,common_resource.source_type,common_resource.ip,common_resource.port FROM `managed_resource` LEFT JOIN `common_resource` ON (`managed_resource`.`resource_id`=`common_resource`.`resource_id`) LEFT JOIN `resource_mark` ON (`managed_resource`.`resource_mark_id` = `resource_mark`.`id`) LEFT JOIN `rules_template` ON (`managed_resource`.`rule_template_id` = `rules_template`.`template_id`) ORDER BY `src_instance_id` ASC |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.