From fb3641eca7c0f6f8b41af3813c56a108f9c78bcc Mon Sep 17 00:00:00 2001
From: Dariusz Kedzierski <dkedzierski@syncad.com>
Date: Wed, 29 Jul 2020 12:38:07 +0200
Subject: [PATCH] Fixed typos and reverted decimal fix
- Fixed some typos in sql calls,
- Reverted decimal fix - error was caused by old library
---
hive/db/schema.py | 2 +-
hive/server/bridge_api/methods.py | 2 +-
hive/server/database_api/methods.py | 1 -
hive/utils/normalize.py | 3 ---
4 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/hive/db/schema.py b/hive/db/schema.py
index f0df0af90..ea2765ab6 100644
--- a/hive/db/schema.py
+++ b/hive/db/schema.py
@@ -638,7 +638,7 @@ def setup(db):
hp.is_deleted,
hp.is_pinned,
hr.title AS role_title,
- hr.role_id AS role_is,
+ hr.role_id AS role_id,
hc.title AS community_title,
hc.name AS community_name
FROM hive_posts hp
diff --git a/hive/server/bridge_api/methods.py b/hive/server/bridge_api/methods.py
index e4285c9f6..73da17ef1 100644
--- a/hive/server/bridge_api/methods.py
+++ b/hive/server/bridge_api/methods.py
@@ -53,7 +53,7 @@ SQL_TEMPLATE = """
hp.sc_trend,
hp.role_title,
hp.community_title,
- hr.role_id,
+ hp.role_id,
hp.is_pinned,
hp.curator_payout_value
FROM hive_posts_view hp
diff --git a/hive/server/database_api/methods.py b/hive/server/database_api/methods.py
index 636a92767..ac2196d65 100644
--- a/hive/server/database_api/methods.py
+++ b/hive/server/database_api/methods.py
@@ -234,7 +234,6 @@ async def find_votes(context, params: dict, votes_presentation = VotesPresentati
rshares=number_to_json_value(row.rshares), time=time_string_with_t(row.time), voter=row.voter,
weight=number_to_json_value(row.weight),
))
-
return ret
@return_error_info
diff --git a/hive/utils/normalize.py b/hive/utils/normalize.py
index 447654164..3de9a6e8e 100644
--- a/hive/utils/normalize.py
+++ b/hive/utils/normalize.py
@@ -244,9 +244,6 @@ def number_to_json_value(number):
"""
if number > 0xFFFFFFFF:
return str(number)
- from decimal import Decimal
- if isinstance(number, Decimal):
- return str(number)
return number
def time_string_with_t(time_iso8601):
--
GitLab