aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Bonnici <marc.bonnici@arm.com>2018-11-27 17:27:14 +0000
committersetrofim <setrofim@gmail.com>2018-12-07 09:55:17 +0000
commit64f7c2431e58ea3f5bb2b1b07fae79b7d0fed76c (patch)
tree1339a1285645a780e890d1a9d5c9a66077ea6a69
parent0fee3debea0adfe03de7cef7b476f16dcb391009 (diff)
utils/postgres: Rename postgres_covert to house more general methods
Rename the postgres_covert file to allow for place more general postgres utility functions.
-rw-r--r--wa/output_processors/postgresql.py18
-rw-r--r--wa/utils/postgres.py (renamed from wa/utils/postgres_convert.py)0
2 files changed, 9 insertions, 9 deletions
diff --git a/wa/output_processors/postgresql.py b/wa/output_processors/postgresql.py
index 9866d2b5..cdf360b4 100644
--- a/wa/output_processors/postgresql.py
+++ b/wa/output_processors/postgresql.py
@@ -30,7 +30,7 @@ from devlib.target import KernelVersion, KernelConfig
import wa
from wa import OutputProcessor, Parameter, OutputProcessorError
from wa.framework.target.info import CpuInfo
-from wa.utils import postgres_convert
+from wa.utils import postgres
from wa.utils.serializer import json
from wa.utils.types import level
@@ -130,28 +130,28 @@ class PostgresqlResultProcessor(OutputProcessor):
self.cursor.execute("SELECT NULL::param_enum")
param_oid = self.cursor.description[0][1]
LEVEL = psycopg2.extensions.new_type(
- (status_oid,), "LEVEL", postgres_convert.cast_level)
+ (status_oid,), "LEVEL", postgres.cast_level)
psycopg2.extensions.register_type(LEVEL)
PARAM = psycopg2.extensions.new_type(
- (param_oid,), "PARAM", postgres_convert.cast_vanilla)
+ (param_oid,), "PARAM", postgres.cast_vanilla)
psycopg2.extensions.register_type(PARAM)
- psycopg2.extensions.register_adapter(level, postgres_convert.return_as_is(postgres_convert.adapt_level))
+ psycopg2.extensions.register_adapter(level, postgres.return_as_is(postgres.adapt_level))
psycopg2.extensions.register_adapter(
- postgres_convert.ListOfLevel, postgres_convert.adapt_ListOfX(postgres_convert.adapt_level))
- psycopg2.extensions.register_adapter(KernelVersion, postgres_convert.adapt_vanilla)
+ postgres.ListOfLevel, postgres.adapt_ListOfX(postgres.adapt_level))
+ psycopg2.extensions.register_adapter(KernelVersion, postgres.adapt_vanilla)
psycopg2.extensions.register_adapter(
- CpuInfo, postgres_convert.adapt_vanilla)
+ CpuInfo, postgres.adapt_vanilla)
psycopg2.extensions.register_adapter(
collections.OrderedDict, extras.Json)
psycopg2.extensions.register_adapter(dict, extras.Json)
psycopg2.extensions.register_adapter(
- KernelConfig, postgres_convert.create_iterable_adapter(2, explicit_iterate=True))
+ KernelConfig, postgres.create_iterable_adapter(2, explicit_iterate=True))
# Register ready-made UUID type adapter
extras.register_uuid()
# Insert a run_uuid which will be globally accessible during the run
self.run_uuid = uuid.UUID(str(uuid.uuid4()))
run_output = context.run_output
- retry_on_status = postgres_convert.ListOfLevel(run_output.run_config.retry_on_status)
+ retry_on_status = postgres.ListOfLevel(run_output.run_config.retry_on_status)
self.cursor.execute(
self.sql_command['create_run'],
(
diff --git a/wa/utils/postgres_convert.py b/wa/utils/postgres.py
index 3a983204..3a983204 100644
--- a/wa/utils/postgres_convert.py
+++ b/wa/utils/postgres.py