Skip to content

Include already existing JSON operators in other postgres adapters and fix contains for bigint[] #731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Include already existing JSON operators in other postgres adapters and fix contains for bigint[] #731

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0729b7
Include already existing JSON operators in other dialects that were a…
jgrazina Apr 8, 2025
aeb1203
FIX: ilike any only works for strings, not for bigints (list:integer …
jgrazina Apr 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 8 additions & 20 deletions pydal/dialects/postgre.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,11 +356,11 @@ def any(self, val, query_env={}):

def contains(self, first, second, case_sensitive=True, query_env={}):
if first.type.startswith("list:"):
f = self.expand(second, "string", query_env=query_env)
f = self.expand(second, "string" if first.type == 'list:string' else "integer", query_env=query_env)
s = self.any(first, query_env)
if case_sensitive is True:
return self.eq(f, s)
return self.ilike(f, s, escape="\\", query_env=query_env)
if not case_sensitive and first.type == 'list:string':
return self.ilike(f, s, escape="\\", query_env=query_env)
return self.eq(f, s)
return super(PostgreDialectArrays, self).contains(
first, second, case_sensitive=case_sensitive, query_env=query_env
)
Expand All @@ -379,14 +379,8 @@ def eq(self, first, second=None, query_env={}):
return super(PostgreDialectArrays, self).eq(first, second, query_env)


class PostgreDialectArraysJSON(PostgreDialectArrays):
@sqltype_for("json")
def type_json(self):
return "JSON"

@sqltype_for("jsonb")
def type_jsonb(self):
return "JSONB"
class PostgreDialectArraysJSON(PostgreDialectArrays, PostgreDialectJSON):
pass


@dialects.register_for(PostgreBoolean)
Expand All @@ -396,11 +390,5 @@ def type_boolean(self):
return "BOOLEAN"


class PostgreDialectBooleanJSON(PostgreDialectBoolean):
@sqltype_for("json")
def type_json(self):
return "JSON"

@sqltype_for("jsonb")
def type_jsonb(self):
return "JSONB"
class PostgreDialectBooleanJSON(PostgreDialectBoolean, PostgreDialectJSON):
pass