[glom/gtkmm4v4] gtkmm4: Adapt to Gnome::Gda::SqlStatementType as Type enum class.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom/gtkmm4v4] gtkmm4: Adapt to Gnome::Gda::SqlStatementType as Type enum class.
- Date: Fri, 28 Apr 2017 07:16:15 +0000 (UTC)
commit c41c5074871074a13f54afab40fa772e5be956c3
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Apr 28 08:46:58 2017 +0200
gtkmm4: Adapt to Gnome::Gda::SqlStatementType as Type enum class.
glom/base_db.cc | 6 ++--
glom/base_db_table_data.cc | 10 ++++----
glom/libglom/connectionpool_backends/mysql_self.cc | 2 +-
.../connectionpool_backends/postgres_self.cc | 2 +-
glom/libglom/db_utils.cc | 24 ++++++++++----------
glom/libglom/privs.cc | 10 ++++----
glom/libglom/python_embed/py_glom_record.cc | 2 +-
glom/libglom/python_embed/py_glom_relatedrecord.cc | 4 +-
glom/libglom/report_builder.cc | 4 +-
glom/libglom/sql_utils.cc | 12 +++++-----
glom/mode_data/box_data.cc | 2 +-
glom/mode_data/box_data_calendar_related.cc | 4 +-
glom/mode_data/box_data_portal.cc | 2 +-
glom/mode_data/datawidget/treemodel_db.cc | 2 +-
glom/mode_design/dialog_database_preferences.cc | 4 +-
glom/mode_design/fields/box_db_table_definition.cc | 6 ++--
16 files changed, 48 insertions(+), 48 deletions(-)
---
diff --git a/glom/base_db.cc b/glom/base_db.cc
index 2e8ccab..d69ffd4 100644
--- a/glom/base_db.cc
+++ b/glom/base_db.cc
@@ -527,7 +527,7 @@ void Base_DB::calculate_field_in_all_records(const Glib::ustring& table_name, co
{
//Get primary key values for every record:
- auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builder->select_add_field(primary_key->get_name(), table_name);
builder->select_add_target(table_name);
@@ -1080,7 +1080,7 @@ bool Base_DB::get_field_value_is_unique(const Glib::ustring& table_name, const s
const auto table_name_used = field->get_table_used(table_name);
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builder->select_add_field(field->get_name(), table_name_used);
builder->select_add_target(table_name_used);
builder->set_where(
@@ -1161,7 +1161,7 @@ bool Base_DB::get_primary_key_is_in_foundset(const FoundSet& found_set, const Gn
layout_item->set_full_field_details(primary_key);
fieldsToGet.emplace_back(layout_item);
- auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builder->select_add_target(found_set.m_table_name);
const auto eq_id = builder->add_cond(Gnome::Gda::SQL_OPERATOR_TYPE_EQ,
diff --git a/glom/base_db_table_data.cc b/glom/base_db_table_data.cc
index f79131b..20940de 100644
--- a/glom/base_db_table_data.cc
+++ b/glom/base_db_table_data.cc
@@ -86,7 +86,7 @@ bool Base_DB_Table_Data::record_new(bool use_entered_data, const Gnome::Gda::Val
}
//Get all entered field name/value pairs:
- auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_INSERT);
+ auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::INSERT);
builder->set_table(m_table_name);
//Avoid specifying the same field twice:
@@ -285,7 +285,7 @@ bool Base_DB_Table_Data::add_related_record_for_field(const std::shared_ptr<cons
//Generate the new key value;
}
- auto builder_insert = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_INSERT);
+ auto builder_insert = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::INSERT);
builder_insert->set_table(relationship->get_to_table());
builder_insert->add_field_value(primary_key_field->get_name(), primary_key_value);
if(!DbUtils::query_execute(builder_insert))
@@ -331,7 +331,7 @@ bool Base_DB_Table_Data::add_related_record_for_field(const std::shared_ptr<cons
{
const auto target_table = relationship->get_from_table();
auto builder_update =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_UPDATE);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::UPDATE);
builder_update->set_table(target_table);
builder_update->add_field_value_as_value(relationship->get_from_field(), primary_key_value);
builder_update->set_where(
@@ -388,7 +388,7 @@ bool Base_DB_Table_Data::record_delete(const Gnome::Gda::Value& primary_key_valu
if(field_primary_key && !Conversions::value_is_empty(primary_key_value))
{
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_DELETE);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::DELETE);
builder->set_table(m_table_name);
builder->set_where(
builder->add_cond(Gnome::Gda::SQL_OPERATOR_TYPE_EQ,
@@ -425,7 +425,7 @@ bool Base_DB_Table_Data::get_related_record_exists(const std::shared_ptr<const R
//TODO_Performance: Is this the best way to just find out whether there is one record that meets this
criteria?
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builder->select_add_field(to_field, related_table);
builder->select_add_target(related_table);
builder->set_where(
diff --git a/glom/libglom/connectionpool_backends/mysql_self.cc
b/glom/libglom/connectionpool_backends/mysql_self.cc
index 823c116..a08ccf7 100644
--- a/glom/libglom/connectionpool_backends/mysql_self.cc
+++ b/glom/libglom/connectionpool_backends/mysql_self.cc
@@ -454,7 +454,7 @@ void MySQLSelfHosted::show_active_connections()
{
/* TODO_MySQL
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builder->select_add_field("*", "pg_stat_activity");
builder->select_add_target("pg_stat_activity");
diff --git a/glom/libglom/connectionpool_backends/postgres_self.cc
b/glom/libglom/connectionpool_backends/postgres_self.cc
index 6e751d4..2817005 100644
--- a/glom/libglom/connectionpool_backends/postgres_self.cc
+++ b/glom/libglom/connectionpool_backends/postgres_self.cc
@@ -355,7 +355,7 @@ Backend::StartupErrors PostgresSelfHosted::startup(const SlotProgress& slot_prog
void PostgresSelfHosted::show_active_connections()
{
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builder->select_add_field("*", "pg_stat_activity");
builder->select_add_target("pg_stat_activity");
diff --git a/glom/libglom/db_utils.cc b/glom/libglom/db_utils.cc
index ad71b38..1b83f95 100644
--- a/glom/libglom/db_utils.cc
+++ b/glom/libglom/db_utils.cc
@@ -365,7 +365,7 @@ SystemPrefs get_database_preferences(const std::shared_ptr<const Document>& docu
const auto optional_org_logo = get_field_exists_in_database(GLOM_STANDARD_TABLE_PREFS_TABLE_NAME,
GLOM_STANDARD_TABLE_PREFS_FIELD_ORG_LOGO);
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builder->select_add_target(GLOM_STANDARD_TABLE_PREFS_TABLE_NAME);
builder->select_add_field(GLOM_STANDARD_TABLE_PREFS_FIELD_NAME, GLOM_STANDARD_TABLE_PREFS_TABLE_NAME);
@@ -443,7 +443,7 @@ void set_database_preferences(const std::shared_ptr<Document>& document, const S
//The logo field was introduced in a later version of Glom.
//If the user is not in developer mode then the new field has not yet been added:
- auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_UPDATE);
+ auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::UPDATE);
builder->set_table(GLOM_STANDARD_TABLE_PREFS_TABLE_NAME);
builder->add_field_value(GLOM_STANDARD_TABLE_PREFS_FIELD_NAME, prefs.m_name);
builder->add_field_value(GLOM_STANDARD_TABLE_PREFS_FIELD_ORG_NAME, prefs.m_org_name);
@@ -485,7 +485,7 @@ bool add_standard_tables(const std::shared_ptr<const Document>& document)
if(test)
{
//Add the single record:
- auto builderAdd = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_INSERT);
+ auto builderAdd = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::INSERT);
builderAdd->set_table(GLOM_STANDARD_TABLE_PREFS_TABLE_NAME);
builderAdd->add_field_value(GLOM_STANDARD_TABLE_PREFS_FIELD_ID, 1);
if(!query_execute(builderAdd))
@@ -495,7 +495,7 @@ bool add_standard_tables(const std::shared_ptr<const Document>& document)
const auto system_name = document->get_database_title_original();
if(!system_name.empty())
{
- auto builderUpdate = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_UPDATE);
+ auto builderUpdate = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::UPDATE);
builderUpdate->set_table(GLOM_STANDARD_TABLE_PREFS_TABLE_NAME);
builderUpdate->add_field_value(GLOM_STANDARD_TABLE_PREFS_FIELD_NAME, system_name);
builderUpdate->set_where(builderUpdate->add_cond(Gnome::Gda::SQL_OPERATOR_TYPE_EQ,
@@ -1405,7 +1405,7 @@ Gnome::Gda::Value get_next_auto_increment_value(const Glib::ustring& table_name,
++num_result;
const auto next_value = Conversions::parse_value(num_result);
- auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_UPDATE);
+ auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::UPDATE);
builder->set_table(GLOM_STANDARD_TABLE_AUTOINCREMENTS_TABLE_NAME);
builder->add_field_value_as_value(GLOM_STANDARD_TABLE_AUTOINCREMENTS_FIELD_NEXT_VALUE, next_value);
builder_set_where_autoincrement(builder, table_name, field_name);
@@ -1442,7 +1442,7 @@ Gnome::Gda::Value auto_increment_insert_first_if_necessary(const Glib::ustring&
}
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builder->select_add_field("next_value", GLOM_STANDARD_TABLE_AUTOINCREMENTS_TABLE_NAME);
builder->select_add_target(GLOM_STANDARD_TABLE_AUTOINCREMENTS_TABLE_NAME);
builder_set_where_autoincrement(builder, table_name, field_name);
@@ -1453,7 +1453,7 @@ Gnome::Gda::Value auto_increment_insert_first_if_necessary(const Glib::ustring&
//Start with zero:
//Insert the row if it's not there.
- builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_INSERT);
+ builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::INSERT);
builder->set_table(GLOM_STANDARD_TABLE_AUTOINCREMENTS_TABLE_NAME);
builder->add_field_value(GLOM_STANDARD_TABLE_AUTOINCREMENTS_FIELD_TABLE_NAME, table_name);
builder->add_field_value(GLOM_STANDARD_TABLE_AUTOINCREMENTS_FIELD_FIELD_NAME, field_name);
@@ -1504,7 +1504,7 @@ static void recalculate_next_auto_increment_value(const Glib::ustring& table_nam
auto_increment_insert_first_if_necessary(table_name, field_name);
//Get the max key value in the database:
- auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
std::vector<guint> args;
args.emplace_back(builder->add_field_id(field_name, table_name));
builder->add_field_value_id(builder->add_function("MAX", args));
@@ -1530,7 +1530,7 @@ static void recalculate_next_auto_increment_value(const Glib::ustring& table_nam
const auto next_value = Conversions::parse_value(num_max);
builder.reset();
- builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_UPDATE);
+ builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::UPDATE);
builder->set_table(GLOM_STANDARD_TABLE_AUTOINCREMENTS_TABLE_NAME);
builder->add_field_value_as_value(GLOM_STANDARD_TABLE_AUTOINCREMENTS_FIELD_NEXT_VALUE, next_value);
builder_set_where_autoincrement(builder, table_name, field_name);
@@ -1558,7 +1558,7 @@ void remove_auto_increment(const Glib::ustring& table_name, const Glib::ustring&
}
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_DELETE);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::DELETE);
builder->set_table(GLOM_STANDARD_TABLE_AUTOINCREMENTS_TABLE_NAME);
builder_set_where_autoincrement(builder, table_name, field_name);
@@ -1609,7 +1609,7 @@ bool insert_example_data(const std::shared_ptr<const Document>& document, const
const auto hosting_mode = document->get_hosting_mode();
- auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_INSERT);
+ auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::INSERT);
builder->set_table(table_name);
for(unsigned int i = 0; i < row_data.size(); ++i) //TODO_Performance: Avoid calling size() so much.
{
@@ -2273,7 +2273,7 @@ Gnome::Gda::Value get_lookup_value(const std::shared_ptr<const Document>& docume
const auto target_table = relationship->get_to_table();
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builder->select_add_field(source_field->get_name(), target_table );
builder->select_add_target(target_table );
builder->set_where(
diff --git a/glom/libglom/privs.cc b/glom/libglom/privs.cc
index 68c82cd..7771250 100644
--- a/glom/libglom/privs.cc
+++ b/glom/libglom/privs.cc
@@ -39,7 +39,7 @@ Privs::type_vec_strings Privs::get_database_groups()
type_vec_strings result;
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builder->select_add_field("groname", "pg_group");
builder->select_add_target("pg_group");
@@ -115,7 +115,7 @@ Privs::type_vec_strings Privs::get_database_users(const Glib::ustring& group_nam
{
//pg_shadow contains the users. pg_users is a view of pg_shadow without the password.
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builder->select_add_field("usename", "pg_shadow");
builder->select_add_target("pg_shadow");
@@ -134,7 +134,7 @@ Privs::type_vec_strings Privs::get_database_users(const Glib::ustring& group_nam
else
{
auto builderGroup =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builderGroup->select_add_field("groname", "pg_group");
builderGroup->select_add_field("grolist", "pg_group");
builderGroup->select_add_target("pg_group");
@@ -161,7 +161,7 @@ Privs::type_vec_strings Privs::get_database_users(const Glib::ustring& group_nam
{
//TODO_Performance: Can we do this in one SQL SELECT?
auto builderUser =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builderUser->select_add_field("usename", "pg_user");
builderUser->select_add_target("pg_user");
builderUser->set_where(
@@ -309,7 +309,7 @@ Privileges Privs::get_table_privileges(const Glib::ustring& group_name, const Gl
//Get the permissions:
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
const Glib::ustring function_name = "has_table_privilege";
std::vector<Gnome::Gda::SqlBuilder::Id> args_base;
diff --git a/glom/libglom/python_embed/py_glom_record.cc b/glom/libglom/python_embed/py_glom_record.cc
index 64a3281..0f16448 100644
--- a/glom/libglom/python_embed/py_glom_record.cc
+++ b/glom/libglom/python_embed/py_glom_record.cc
@@ -175,7 +175,7 @@ void PyGlomRecord::setitem(const boost::python::object& key, const boost::python
}
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_UPDATE);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::UPDATE);
builder->set_table(m_table_name);
builder->add_field_value_as_value(field->get_name(), field_value);
builder->set_where(
diff --git a/glom/libglom/python_embed/py_glom_relatedrecord.cc
b/glom/libglom/python_embed/py_glom_relatedrecord.cc
index ed97d2d..48ffb69 100644
--- a/glom/libglom/python_embed/py_glom_relatedrecord.cc
+++ b/glom/libglom/python_embed/py_glom_relatedrecord.cc
@@ -98,7 +98,7 @@ boost::python::object PyGlomRelatedRecord::getitem(const boost::python::object&
//Get the single value from the related records:
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builder->select_add_field(field_name, related_table);
builder->select_add_target(related_table);
builder->set_where(
@@ -187,7 +187,7 @@ boost::python::object PyGlomRelatedRecord::generic_aggregate(const std::string&
//Get the aggregate value from the related records:
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
const Gnome::Gda::SqlBuilder::Id id_function = builder->add_function(aggregate,
builder->add_id(field_name)); //TODO: It would be nice to specify the table here too.
builder->add_field_value_id(id_function);
diff --git a/glom/libglom/report_builder.cc b/glom/libglom/report_builder.cc
index 7cee86c..4a660e3 100644
--- a/glom/libglom/report_builder.cc
+++ b/glom/libglom/report_builder.cc
@@ -223,7 +223,7 @@ bool ReportBuilder::report_build_groupby(const FoundSet& found_set_parent, xmlpp
const auto group_field_table_name = field_group_by->get_table_used(found_set_parent.m_table_name);
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builder->select_add_field(field_group_by->get_name(), group_field_table_name);
builder->select_add_target(group_field_table_name);
@@ -461,7 +461,7 @@ bool ReportBuilder::report_build_records_field(const FoundSet& found_set, xmlpp:
{
//In this case it can only be a system preferences field.
//So let's get that data here:
- auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builder->set_table(field->get_table_used(found_set.m_table_name));
builder->select_add_field(field->get_name(), found_set.m_table_name);
builder->select_set_limit(1);
diff --git a/glom/libglom/sql_utils.cc b/glom/libglom/sql_utils.cc
index 69027fc..cdd2ed8 100644
--- a/glom/libglom/sql_utils.cc
+++ b/glom/libglom/sql_utils.cc
@@ -77,7 +77,7 @@ Glib::RefPtr<Gnome::Gda::SqlBuilder> build_sql_select_count_rows(const Glib::Ref
return result;
}
- result = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ result = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
//Note that the alias is just because the SQL syntax requires it - we get an error if we don't use it.
//Be careful not to include ORDER BY clauses in this, because that would make it unnecessarily slow:
@@ -249,7 +249,7 @@ Glib::RefPtr<Gnome::Gda::SqlBuilder> build_sql_select_with_where_clause(const Gl
//Build the whole SQL statement:
try
{
- builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builder->select_add_target(table_name);
//Add the fields to SELECT, plus the tables that they are selected FROM.
@@ -320,7 +320,7 @@ Gnome::Gda::SqlExpr build_simple_where_expression(const Glib::ustring& table_nam
return Gnome::Gda::SqlExpr();
}
- auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builder->select_add_target(table_name); //This might not be necessary.
const Gnome::Gda::SqlBuilder::Id id = builder->add_cond(Gnome::Gda::SQL_OPERATOR_TYPE_EQ,
builder->add_field_id(key_field->get_name(),
table_name),
@@ -333,7 +333,7 @@ Gnome::Gda::SqlExpr build_simple_where_expression(const Glib::ustring& table_nam
Gnome::Gda::SqlExpr build_combined_where_expression(const Gnome::Gda::SqlExpr& a, const Gnome::Gda::SqlExpr&
b, Gnome::Gda::SqlOperatorType op)
{
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
const Gnome::Gda::SqlBuilder::Id id = builder->add_cond(op,
builder->import_expression(a),
@@ -456,7 +456,7 @@ Gnome::Gda::SqlExpr get_find_where_clause_quick(const std::shared_ptr<const Docu
return Gnome::Gda::SqlExpr();
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builder->select_add_target(table_name);
//We need to add some fields to select,
@@ -544,7 +544,7 @@ Glib::RefPtr<Gnome::Gda::SqlBuilder> build_sql_update_with_where_clause(
//Build the whole SQL statement:
try
{
- builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_UPDATE);
+ builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::UPDATE);
builder->set_table(table_name);
builder->add_field_value_as_value(field->get_name(), value);
diff --git a/glom/mode_data/box_data.cc b/glom/mode_data/box_data.cc
index 9254406..4f31e08 100644
--- a/glom/mode_data/box_data.cc
+++ b/glom/mode_data/box_data.cc
@@ -87,7 +87,7 @@ FoundSet Box_Data::get_found_set() const
Gnome::Gda::SqlExpr Box_Data::get_find_where_clause() const
{
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builder->select_add_target(m_table_name); //This might not be necessary.
guint where_cond_id = 0;
diff --git a/glom/mode_data/box_data_calendar_related.cc b/glom/mode_data/box_data_calendar_related.cc
index 8662375..9f21d43 100644
--- a/glom/mode_data/box_data_calendar_related.cc
+++ b/glom/mode_data/box_data_calendar_related.cc
@@ -149,7 +149,7 @@ bool Box_Data_Calendar_Related::fill_from_database()
auto date_field = derived_portal->get_date_field();
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
const auto cond = builder->add_cond(Gnome::Gda::SQL_OPERATOR_TYPE_BETWEEN,
builder->add_field_id(date_field->get_name(), m_found_set.m_table_name),
builder->add_expr_as_value(date_start_value),
@@ -262,7 +262,7 @@ void Box_Data_Calendar_Related::on_record_added(const Gnome::Gda::Value& primary
//Create the link by setting the foreign key
if(m_key_field && portal)
{
- auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_UPDATE);
+ auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::UPDATE);
const auto target_table = portal->get_table_used(Glib::ustring() /* not relevant */);
builder->set_table(target_table);
builder->add_field_value_as_value(m_key_field->get_name(), m_key_value);
diff --git a/glom/mode_data/box_data_portal.cc b/glom/mode_data/box_data_portal.cc
index fc7b3f9..c56395a 100644
--- a/glom/mode_data/box_data_portal.cc
+++ b/glom/mode_data/box_data_portal.cc
@@ -77,7 +77,7 @@ void Box_Data_Portal::make_record_related(const Gnome::Gda::Value& related_recor
}
const auto target_table = portal->get_table_used(Glib::ustring() /* not relevant */);
- auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_UPDATE);
+ auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::UPDATE);
builder->set_table(target_table);
builder->add_field_value_as_value(m_key_field->get_name(), m_key_value);
builder->set_where(
diff --git a/glom/mode_data/datawidget/treemodel_db.cc b/glom/mode_data/datawidget/treemodel_db.cc
index bf4a1d5..29b447b 100644
--- a/glom/mode_data/datawidget/treemodel_db.cc
+++ b/glom/mode_data/datawidget/treemodel_db.cc
@@ -990,7 +990,7 @@ void DbTreeModel::get_record_counts(gulong& total, gulong& found) const
//TODO: Apparently, this is very slow:
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
const auto id_function = builder->add_function("count", builder->add_id("*")); //TODO: Is * allowed
here?
builder->add_field_value_id(id_function);
diff --git a/glom/mode_design/dialog_database_preferences.cc b/glom/mode_design/dialog_database_preferences.cc
index 67aa450..a5c0873 100644
--- a/glom/mode_design/dialog_database_preferences.cc
+++ b/glom/mode_design/dialog_database_preferences.cc
@@ -115,7 +115,7 @@ void Dialog_Database_Preferences::on_treeview_cell_edited_next_value(const Glib:
const Gnome::Gda::Value next_value = Conversions::parse_value(new_value);
- auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_UPDATE);
+ auto builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::UPDATE);
builder->set_table(GLOM_STANDARD_TABLE_AUTOINCREMENTS_TABLE_NAME);
builder->add_field_value_as_value(GLOM_STANDARD_TABLE_AUTOINCREMENTS_FIELD_NEXT_VALUE, next_value);
builder->set_where(
@@ -159,7 +159,7 @@ void Dialog_Database_Preferences::load_from_document()
m_model_autoincrements->clear();
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builder->select_add_field(GLOM_STANDARD_TABLE_AUTOINCREMENTS_FIELD_TABLE_NAME,
GLOM_STANDARD_TABLE_AUTOINCREMENTS_TABLE_NAME);
builder->select_add_field(GLOM_STANDARD_TABLE_AUTOINCREMENTS_FIELD_FIELD_NAME,
diff --git a/glom/mode_design/fields/box_db_table_definition.cc
b/glom/mode_design/fields/box_db_table_definition.cc
index e6a2048..d728813 100644
--- a/glom/mode_design/fields/box_db_table_definition.cc
+++ b/glom/mode_design/fields/box_db_table_definition.cc
@@ -693,7 +693,7 @@ bool Box_DB_Table_Definition::field_has_null_values(const std::shared_ptr<const
//Note that "= Null" doesn't work, though it doesn't error either.
//Note also that SELECT COUNT always returns 0 if all the values are NULL, so we can't use that to be more
efficient.
auto builder =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builder->select_add_field(field->get_name(), m_table_name);
builder->select_add_target(m_table_name);
builder->set_where(
@@ -724,7 +724,7 @@ bool Box_DB_Table_Definition::field_has_non_unique_values(const std::shared_ptr<
long count_all = 0;
//Count the distinct rows:
- auto builder_query_distinct = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_UPDATE);
+ auto builder_query_distinct = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::UPDATE);
builder_query_distinct->select_set_distinct();
builder_query_distinct->set_table(m_table_name);
builder_query_distinct->select_add_field(field->get_name(), m_table_name);
@@ -742,7 +742,7 @@ bool Box_DB_Table_Definition::field_has_non_unique_values(const std::shared_ptr<
//Count all rows, to compare. TODO_performance: Is there a more efficient way to do this? Maybe count(*),
which apparently doesn't ignore NULL rows like count(somefield) would.
auto builder_query_all =
- Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+ Gnome::Gda::SqlBuilder::create(Gnome::Gda::SqlStatement::Type::SELECT);
builder_query_all->select_add_field(field->get_name(), m_table_name);
builder_query_all->select_add_target(m_table_name);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
