[glom] build_sql_select_fields_to_get():
- From: Murray Cumming <murrayc src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [glom] build_sql_select_fields_to_get():
- Date: Fri, 2 Oct 2009 12:43:58 +0000 (UTC)
commit 12fe765ce000c43a5f66626ac8b52e121455c2a7
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Oct 2 14:42:28 2009 +0200
build_sql_select_fields_to_get():
Removed the unused extra_join parameter.
glom/base_db.cc | 4 ++--
glom/libglom/utils.cc | 4 ++--
glom/libglom/utils.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/glom/base_db.cc b/glom/base_db.cc
index 00af727..798ae61 100644
--- a/glom/base_db.cc
+++ b/glom/base_db.cc
@@ -3487,8 +3487,8 @@ void Base_DB::set_found_set_where_clause_for_portal(FoundSet& found_set, const s
Glib::ustring sql_part_from;
Glib::ustring sql_part_leftouterjoin;
const Glib::ustring sql_part_fields = Utils::build_sql_select_fields_to_get(
- found_set.m_table_name, fields, found_set.m_extra_join,
- found_set.m_sort_clause, sql_part_from, sql_part_leftouterjoin);
+ found_set.m_table_name, fields, found_set.m_sort_clause,
+ sql_part_from, sql_part_leftouterjoin);
found_set.m_extra_group_by = "GROUP BY " + sql_part_fields;
diff --git a/glom/libglom/utils.cc b/glom/libglom/utils.cc
index f04c1cb..fcb5b8d 100644
--- a/glom/libglom/utils.cc
+++ b/glom/libglom/utils.cc
@@ -231,7 +231,7 @@ static void add_to_relationships_list(type_list_relationships& list_relationship
}
-Glib::ustring Utils::build_sql_select_fields_to_get(const Glib::ustring& table_name, const type_vecConstLayoutFields& fieldsToGet, const Glib::ustring& extra_join, const type_sort_clause& sort_clause, Glib::ustring& sql_part_from, Glib::ustring& sql_part_leftouterjoin)
+Glib::ustring Utils::build_sql_select_fields_to_get(const Glib::ustring& table_name, const type_vecConstLayoutFields& fieldsToGet, const type_sort_clause& sort_clause, Glib::ustring& sql_part_from, Glib::ustring& sql_part_leftouterjoin)
{
//Initialize output parameters:
sql_part_from = Glib::ustring();
@@ -323,7 +323,7 @@ Glib::ustring Utils::build_sql_select_with_where_clause(const Glib::ustring& tab
Glib::ustring sql_part_from;
Glib::ustring sql_part_leftouterjoin;
const Glib::ustring sql_part_fields = Utils::build_sql_select_fields_to_get(
- table_name, fieldsToGet, extra_join, sort_clause, sql_part_from, sql_part_leftouterjoin);
+ table_name, fieldsToGet, sort_clause, sql_part_from, sql_part_leftouterjoin);
//Build the whole SQL statement:
Glib::ustring result =
diff --git a/glom/libglom/utils.h b/glom/libglom/utils.h
index 310ae15..213dbd7 100644
--- a/glom/libglom/utils.h
+++ b/glom/libglom/utils.h
@@ -45,7 +45,7 @@ typedef std::vector< sharedptr<LayoutItem_Field> > type_vecLayoutFields;
typedef std::vector< sharedptr<const LayoutItem_Field> > type_vecConstLayoutFields;
//TODO: Move these to their own file:
-Glib::ustring build_sql_select_fields_to_get(const Glib::ustring& table_name, const type_vecConstLayoutFields& fieldsToGet, const Glib::ustring& extra_join, const type_sort_clause& sort_clause, Glib::ustring& sql_part_from, Glib::ustring& sql_part_leftouterjoin);
+Glib::ustring build_sql_select_fields_to_get(const Glib::ustring& table_name, const type_vecConstLayoutFields& fieldsToGet, const type_sort_clause& sort_clause, Glib::ustring& sql_part_from, Glib::ustring& sql_part_leftouterjoin);
Glib::ustring build_sql_select_with_where_clause(const Glib::ustring& table_name, const type_vecLayoutFields& fieldsToGet, const Glib::ustring& where_clause = Glib::ustring(), const Glib::ustring& extra_join = Glib::ustring(), const type_sort_clause& sort_clause = type_sort_clause(), const Glib::ustring& extra_group_by = Glib::ustring());
Glib::ustring build_sql_select_with_where_clause(const Glib::ustring& table_name, const type_vecConstLayoutFields& fieldsToGet, const Glib::ustring& where_clause = Glib::ustring(), const Glib::ustring& extra_join = Glib::ustring(), const type_sort_clause& sort_clause = type_sort_clause(), const Glib::ustring& extra_group_by = Glib::ustring());
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]