CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 11:18:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix migrations from JSON driver (#3714)

Browse Source
This commit is contained in:
jack1142 2020-04-27 01:32:52 +02:00 committed by GitHub
parent 00d20f14b9
commit a1095285e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
redbot/core/drivers/json.py
View File

@ -187,11 +187,11 @@ class JsonDriver(BaseDriver):
continue continue
if not isinstance(data, dict): if not isinstance(data, dict):
continue continue
for cog, inner in data.items(): cog_name = _dir.stem
for cog_id, inner in data.items():
if not isinstance(inner, dict): if not isinstance(inner, dict):
continue continue
for cog_id in inner: yield cog_name, cog_id
yield cog, cog_id
async def import_data(self, cog_data, custom_group_data): async def import_data(self, cog_data, custom_group_data):
def update_write_data(identifier_data: IdentifierData, _data): def update_write_data(identifier_data: IdentifierData, _data):

11
redbot/setup.py
View File

@ -108,12 +108,9 @@ def get_storage_type():
storage = None storage = None
while storage is None: while storage is None:
print() print()
print("Please choose your storage backend (if you're unsure, choose 1).") print("Please choose your storage backend (if you're unsure, just choose 1).")
print("1. JSON (file storage, requires no database).") print("1. JSON (file storage, requires no database).")
print( print("2. PostgreSQL (Requires a database server)")
"2. PostgreSQL (Requires a database server)"
"\n(Warning: You cannot convert postgres instances to other backends yet)"
)
storage = input("> ") storage = input("> ")
try: try:
storage = int(storage) storage = int(storage)
@ -382,7 +379,7 @@ def delete(
@cli.command() @cli.command()
@click.argument("instance", type=click.Choice(instance_list)) @click.argument("instance", type=click.Choice(instance_list))
@click.argument("backend", type=click.Choice(["json"])) # TODO: GH-3115 @click.argument("backend", type=click.Choice(["json", "postgres"]))
def convert(instance, backend): def convert(instance, backend):
"""Convert data backend of an instance.""" """Convert data backend of an instance."""
current_backend = get_current_backend(instance) current_backend = get_current_backend(instance)
@ -394,8 +391,6 @@ def convert(instance, backend):
if current_backend == BackendType.MONGOV1: if current_backend == BackendType.MONGOV1:
raise RuntimeError("Please see the 3.2 release notes for upgrading a bot using mongo.") raise RuntimeError("Please see the 3.2 release notes for upgrading a bot using mongo.")
elif current_backend == BackendType.POSTGRES: # TODO: GH-3115
raise RuntimeError("Converting away from postgres isn't currently supported")
else: else:
new_storage_details = asyncio.run(do_migration(current_backend, target)) new_storage_details = asyncio.run(do_migration(current_backend, target))