Skip to content

Commit

Permalink
[#3556] rely on populate_full_text_trigger
Browse files Browse the repository at this point in the history 
remove _to_full_text, json_get_values in python
  • Loading branch information
@wardi
wardi authored and David Read committed Aug 25, 2017
1 parent 3ee86e9 commit eafb860
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 68 deletions.
77 changes: 30 additions & 47 deletions ckanext/datastore/backend/postgres.py
View file
Expand Up @@ -349,22 +349,6 @@ def _validate_record(record, num, field_names):
})


def _to_full_text(fields, record):
full_text = []
ft_types = ['int8', 'int4', 'int2', 'float4', 'float8', 'date', 'time',
'timetz', 'timestamp', 'numeric', 'text']
for field in fields:
value = record.get(field['id'])
if not value:
continue

if field['type'].lower() in ft_types and unicode(value):
full_text.append(unicode(value))
else:
full_text.extend(json_get_values(value))
return ' '.join(set(full_text))


def _where_clauses(data_dict, fields_types):
filters = data_dict.get('filters', {})
clauses = []
Expand Down Expand Up @@ -755,19 +739,6 @@ def convert(data, type_name):
return unicode(data)


def json_get_values(obj, current_list=None):
if current_list is None:
current_list = []
if isinstance(obj, list) or isinstance(obj, tuple):
for item in obj:
json_get_values(item, current_list)
elif isinstance(obj, dict):
json_get_values(obj.items(), current_list)
elif obj:
current_list.append(unicode(obj))
return current_list


def check_fields(context, fields):
'''Check if field types are valid.'''
for field in fields:
Expand Down Expand Up @@ -1027,8 +998,11 @@ def upsert_data(context, data_dict):
fields = _get_fields(context, data_dict)
field_names = _pluck('id', fields)
records = data_dict['records']
sql_columns = ", ".join(['"%s"' % name.replace(
'%', '%%') for name in field_names] + ['"_full_text"'])
sql_columns = ", ".join(
identifier(name) for name in field_names)
sql_full_text = " || ' ' || ".join(
identifier(name) + "::text"
for name in field_names)

if method == _INSERT:
rows = []
Expand All @@ -1042,13 +1016,12 @@ def upsert_data(context, data_dict):
# a tuple with an empty second value
value = (json.dumps(value), '')
row.append(value)
row.append(_to_full_text(fields, record))
rows.append(row)

sql_string = u'''INSERT INTO "{res_id}" ({columns})
VALUES ({values}, to_tsvector(%s));'''.format(
res_id=data_dict['resource_id'],
columns=sql_columns,
sql_string = u'''INSERT INTO {res_id} ({columns})
VALUES ({values});'''.format(
res_id=identifier(data_dict['resource_id']),
columns=sql_columns.replace('%', '%%'),
values=', '.join(['%s' for field in field_names])
)

Expand Down Expand Up @@ -1104,18 +1077,16 @@ def upsert_data(context, data_dict):

used_values = [record[field] for field in used_field_names]

full_text = _to_full_text(fields, record)

if method == _UPDATE:
sql_string = u'''
UPDATE "{res_id}"
SET ({columns}, "_full_text") = ({values}, to_tsvector(%s))
SET ({columns}, "_full_text") = ({values}, NULL)
WHERE ({primary_key}) = ({primary_value});
'''.format(
res_id=data_dict['resource_id'],
columns=u', '.join(
[u'"{0}"'.format(field)
for field in used_field_names]),
[identifier(field)
for field in used_field_names]).replace('%', '%%'),
values=u', '.join(
['%s' for _ in used_field_names]),
primary_key=u','.join(
Expand All @@ -1124,7 +1095,7 @@ def upsert_data(context, data_dict):
)
try:
results = context['connection'].execute(
sql_string, used_values + [full_text] + unique_values)
sql_string, used_values + unique_values)
except sqlalchemy.exc.DatabaseError as err:
raise ValidationError({
u'records': [_programming_error_summary(err)],
Expand All @@ -1139,10 +1110,10 @@ def upsert_data(context, data_dict):
elif method == _UPSERT:
sql_string = u'''
UPDATE "{res_id}"
SET ({columns}, "_full_text") = ({values}, to_tsvector(%s))
SET ({columns}, "_full_text") = ({values}, NULL)
WHERE ({primary_key}) = ({primary_value});
INSERT INTO "{res_id}" ({columns}, "_full_text")
SELECT {values}, to_tsvector(%s)
INSERT INTO "{res_id}" ({columns})
SELECT {values}
WHERE NOT EXISTS (SELECT 1 FROM "{res_id}"
WHERE ({primary_key}) = ({primary_value}));
'''.format(
Expand All @@ -1159,7 +1130,7 @@ def upsert_data(context, data_dict):
try:
context['connection'].execute(
sql_string,
(used_values + [full_text] + unique_values) * 2)
(used_values + unique_values) * 2)
except sqlalchemy.exc.DatabaseError as err:
raise ValidationError({
u'records': [_programming_error_summary(err)],
Expand Down Expand Up @@ -1391,7 +1362,8 @@ def _create_triggers(connection, resource_id, triggers):
or "for_each" parameters from triggers list.
'''
existing = connection.execute(
u'SELECT tgname FROM pg_trigger WHERE tgrelid = %s::regclass',
u"""SELECT tgname FROM pg_trigger
WHERE tgrelid = %s::regclass AND tgname LIKE 't___'""",
resource_id)
sql_list = (
[u'DROP TRIGGER {name} ON {table}'.format(
Expand All @@ -1413,6 +1385,14 @@ def _create_triggers(connection, resource_id, triggers):
raise ValidationError({u'triggers': [_programming_error_summary(pe)]})


def _create_fulltext_trigger(connection, resource_id):
connection.execute(
u'''CREATE TRIGGER zfulltext
BEFORE INSERT OR UPDATE ON {table}
FOR EACH ROW EXECUTE PROCEDURE populate_full_text_trigger()'''.format(
table=identifier(resource_id)))


def upsert(context, data_dict):
'''
This method combines upsert insert and update on the datastore. The method
Expand Down Expand Up @@ -1804,6 +1784,9 @@ def create(self, context, data_dict):
).fetchone()
if not result:
create_table(context, data_dict)
_create_fulltext_trigger(
context['connection'],
data_dict['resource_id'])
else:
alter_table(context, data_dict)
if 'triggers' in data_dict:
Expand Down
2 changes: 1 addition & 1 deletion ckanext/datastore/tests/helpers.py
View file
Expand Up @@ -26,7 +26,7 @@ def clear_db(Session):
SELECT 'drop function ' || quote_ident(proname) || '();'
FROM pg_proc
INNER JOIN pg_namespace ns ON (pg_proc.pronamespace = ns.oid)
WHERE ns.nspname = 'public'
WHERE ns.nspname = 'public' AND proname != 'populate_full_text_trigger'
'''
drop_functions = u''.join(r[0] for r in c.execute(drop_functions_sql))
if drop_functions:
Expand Down
20 changes: 0 additions & 20 deletions ckanext/datastore/tests/test_db.py
View file
Expand Up @@ -173,26 +173,6 @@ def test_upsert_with_insert_method_and_invalid_data(
backend.InvalidDataError, db.upsert_data, context, data_dict)


class TestJsonGetValues(object):
def test_returns_empty_list_if_called_with_none(self):
assert_equal(db.json_get_values(None), [])

def test_returns_list_with_value_if_called_with_string(self):
assert_equal(db.json_get_values('foo'), ['foo'])

def test_returns_list_with_only_the_original_truthy_values_if_called(self):
data = [None, 'foo', 42, 'bar', {}, []]
assert_equal(db.json_get_values(data), ['foo', '42', 'bar'])

def test_returns_flattened_list(self):
data = ['foo', ['bar', ('baz', 42)]]
assert_equal(db.json_get_values(data), ['foo', 'bar', 'baz', '42'])

def test_returns_only_truthy_values_from_dict(self):
data = {'foo': 'bar', 'baz': [42, None, {}, [], 'hey']}
assert_equal(db.json_get_values(data), ['foo', 'bar', 'baz', '42', 'hey'])


class TestGetAllResourcesIdsInDatastore(object):
@classmethod
def setup_class(cls):
Expand Down

0 comments on commit eafb860

Please sign in to comment.