whummer · Feb 16, 2022 · Feb 16, 2022 · Feb 21, 2022
Showing with 12 additions and 2 deletions.

+10 −1 postgresql_proxy/interceptors.py

+1 −0 requirements.txt

+1 −1 setup.py
diff --git a/postgresql_proxy/interceptors.py b/postgresql_proxy/interceptors.py
@@ -1,4 +1,5 @@
 import logging
+from pg8000.converters import PG_PY_ENCODINGS
 
 class Interceptor:
     def __init__(self, interceptor_config, plugins, context):
@@ -12,9 +13,17 @@ def intercept(self, packet_type, data):
     def get_codec(self):
         if self.context is not None and 'connect_params' in self.context:
             if self.context['connect_params'] is not None and 'client_encoding' in self.context['connect_params']:
-                return self.context['connect_params']['client_encoding']
+                return self.convert_encoding_to_python(self.context['connect_params']['client_encoding'])
         return 'utf-8'
 
+    @staticmethod
+    def convert_encoding_to_python(encoding: str) -> str:
+        encoding = encoding.lower()
+        result = PG_PY_ENCODINGS.get(encoding, encoding)
+        if not result:
+            raise Exception(f"Encoding {encoding} not supported by postgresql-proxy!")
+        return result
+
 
 class CommandInterceptor(Interceptor):
     def intercept(self, packet_type, data):

diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,3 @@
+pg8000>=1.10
 psycopg2-binary>=2.7.5
 PyYAML>=3.13
diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@
 
     setup(
         name='postgresql-proxy',
-        version='0.0.3',
+        version='0.0.4',
         description='Postgresql Proxy',
         packages=find_packages(exclude=('tests', 'tests.*')),
         install_requires=install_requires,