Skip to content

changed collate a bit #1471

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

Merged
fnc12 merged 6 commits into from
Jan 29, 2026
Merged

changed collate a bit #1471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1c52f64
minor refactoring
fnc12 Jan 11, 2026
5d31492
code format
fnc12 Jan 11, 2026
2e91e7b
code format with 20
fnc12 Jan 11, 2026
54e539b
added collate to serializer
fnc12 Jan 14, 2026
45ef861
changed field name and optimized return value
fnc12 Jan 18, 2026
980e792
Merge branch 'dev' into collate-minor-refactoring
fnc12 Jan 29, 2026
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
4 changes: 2 additions & 2 deletions dev/ast_iterator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ namespace sqlite_orm::internal {

template<class L>
SQLITE_ORM_STATIC_CALLOP void operator()(const node_type& col, L& lambda) SQLITE_ORM_OR_CONST_CALLOP {
iterate_ast(col.expr, lambda);
iterate_ast(col.expression, lambda);
}
};

Expand Down Expand Up @@ -761,7 +761,7 @@ namespace sqlite_orm::internal {

template<class L>
SQLITE_ORM_STATIC_CALLOP void operator()(const node_type& node, L& lambda) SQLITE_ORM_OR_CONST_CALLOP {
iterate_ast(node.expr, lambda);
iterate_ast(node.expression, lambda);
}
};
}
18 changes: 6 additions & 12 deletions dev/conditions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,32 +34,26 @@ namespace sqlite_orm::internal {
*/
template<class T>
struct collate_t : condition_t {
T expr;
T expression;
collate_argument argument;

collate_t(T expr_, collate_argument argument_) : expr(std::move(expr_)), argument(argument_) {}

operator std::string() const {
return collate_constraint_t{this->argument};
}
collate_t(T expression_, collate_argument argument_) :
expression(std::move(expression_)), argument(argument_) {}
};

struct named_collate_base {
std::string name;

operator std::string() const {
return "COLLATE " + this->name;
}
};

/**
* Collated something with custom collate function
*/
template<class T>
struct named_collate : named_collate_base {
T expr;
T expression;

named_collate(T expr_, std::string name_) : named_collate_base{std::move(name_)}, expr(std::move(expr_)) {}
named_collate(T expression_, std::string name_) :
named_collate_base{std::move(name_)}, expression(std::move(expression_)) {}
};

struct negated_condition_string {
Expand Down
4 changes: 0 additions & 4 deletions dev/constraints.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,10 +407,6 @@ namespace sqlite_orm::internal {
struct collate_constraint_t {
collate_argument argument = collate_argument::binary;

operator std::string() const {
return "COLLATE " + this->string_from_collate_argument(this->argument);
}

static std::string string_from_collate_argument(collate_argument argument) {
switch (argument) {
case collate_argument::binary:
Expand Down
13 changes: 6 additions & 7 deletions dev/statement_serializer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,12 +911,11 @@ namespace sqlite_orm::internal {
using statement_type = named_collate<T>;

template<class Ctx>
SQLITE_ORM_STATIC_CALLOP std::string operator()(const statement_type& c,
SQLITE_ORM_STATIC_CALLOP std::string operator()(const statement_type& statement,
const Ctx& context) SQLITE_ORM_OR_CONST_CALLOP {
auto newContext = context;
newContext.use_parentheses = false;
auto res = serialize(c.expr, newContext);
return res + " " + static_cast<std::string>(c);
return serialize(statement.expression, newContext) + " COLLATE " + statement.name;
}
};

Expand All @@ -925,12 +924,12 @@ namespace sqlite_orm::internal {
using statement_type = collate_t<T>;

template<class Ctx>
SQLITE_ORM_STATIC_CALLOP std::string operator()(const statement_type& c,
SQLITE_ORM_STATIC_CALLOP std::string operator()(const statement_type& statement,
const Ctx& context) SQLITE_ORM_OR_CONST_CALLOP {
auto newContext = context;
newContext.use_parentheses = false;
auto res = serialize(c.expr, newContext);
return res + " " + static_cast<std::string>(c);
return serialize(statement.expression, newContext) + " COLLATE " +
collate_constraint_t::string_from_collate_argument(statement.argument);
}
};

Expand Down Expand Up @@ -1265,7 +1264,7 @@ namespace sqlite_orm::internal {
template<class Ctx>
SQLITE_ORM_STATIC_CALLOP std::string operator()(const statement_type& statement,
const Ctx&) SQLITE_ORM_OR_CONST_CALLOP {
return static_cast<std::string>(statement);
return "COLLATE " + statement.string_from_collate_argument(statement.argument);
}
};

Expand Down
39 changes: 14 additions & 25 deletions include/sqlite_orm/sqlite_orm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3818,10 +3818,6 @@ namespace sqlite_orm::internal {
struct collate_constraint_t {
collate_argument argument = collate_argument::binary;

operator std::string() const {
return "COLLATE " + this->string_from_collate_argument(this->argument);
}

static std::string string_from_collate_argument(collate_argument argument) {
switch (argument) {
case collate_argument::binary:
Expand Down Expand Up @@ -5256,32 +5252,26 @@ namespace sqlite_orm::internal {
*/
template<class T>
struct collate_t : condition_t {
T expr;
T expression;
collate_argument argument;

collate_t(T expr_, collate_argument argument_) : expr(std::move(expr_)), argument(argument_) {}

operator std::string() const {
return collate_constraint_t{this->argument};
}
collate_t(T expression_, collate_argument argument_) :
expression(std::move(expression_)), argument(argument_) {}
};

struct named_collate_base {
std::string name;

operator std::string() const {
return "COLLATE " + this->name;
}
};

/**
* Collated something with custom collate function
*/
template<class T>
struct named_collate : named_collate_base {
T expr;
T expression;

named_collate(T expr_, std::string name_) : named_collate_base{std::move(name_)}, expr(std::move(expr_)) {}
named_collate(T expression_, std::string name_) :
named_collate_base{std::move(name_)}, expression(std::move(expression_)) {}
};

struct negated_condition_string {
Expand Down Expand Up @@ -16653,7 +16643,7 @@ namespace sqlite_orm::internal {

template<class L>
SQLITE_ORM_STATIC_CALLOP void operator()(const node_type& col, L& lambda) SQLITE_ORM_OR_CONST_CALLOP {
iterate_ast(col.expr, lambda);
iterate_ast(col.expression, lambda);
}
};

Expand Down Expand Up @@ -16915,7 +16905,7 @@ namespace sqlite_orm::internal {

template<class L>
SQLITE_ORM_STATIC_CALLOP void operator()(const node_type& node, L& lambda) SQLITE_ORM_OR_CONST_CALLOP {
iterate_ast(node.expr, lambda);
iterate_ast(node.expression, lambda);
}
};
}
Expand Down Expand Up @@ -21785,12 +21775,11 @@ namespace sqlite_orm::internal {
using statement_type = named_collate<T>;

template<class Ctx>
SQLITE_ORM_STATIC_CALLOP std::string operator()(const statement_type& c,
SQLITE_ORM_STATIC_CALLOP std::string operator()(const statement_type& statement,
const Ctx& context) SQLITE_ORM_OR_CONST_CALLOP {
auto newContext = context;
newContext.use_parentheses = false;
auto res = serialize(c.expr, newContext);
return res + " " + static_cast<std::string>(c);
return serialize(statement.expression, newContext) + " COLLATE " + statement.name;
}
};

Expand All @@ -21799,12 +21788,12 @@ namespace sqlite_orm::internal {
using statement_type = collate_t<T>;

template<class Ctx>
SQLITE_ORM_STATIC_CALLOP std::string operator()(const statement_type& c,
SQLITE_ORM_STATIC_CALLOP std::string operator()(const statement_type& statement,
const Ctx& context) SQLITE_ORM_OR_CONST_CALLOP {
auto newContext = context;
newContext.use_parentheses = false;
auto res = serialize(c.expr, newContext);
return res + " " + static_cast<std::string>(c);
return serialize(statement.expression, newContext) + " COLLATE " +
collate_constraint_t::string_from_collate_argument(statement.argument);
}
};

Expand Down Expand Up @@ -22139,7 +22128,7 @@ namespace sqlite_orm::internal {
template<class Ctx>
SQLITE_ORM_STATIC_CALLOP std::string operator()(const statement_type& statement,
const Ctx&) SQLITE_ORM_OR_CONST_CALLOP {
return static_cast<std::string>(statement);
return "COLLATE " + statement.string_from_collate_argument(statement.argument);
}
};

Expand Down
Loading