Changeset:
63f7695c2c89
https://sourceforge.net/p/mrbs/hg-code/ci/63f7695c2c89cfbe5db81eb75b493e469667c8de
Author:
Campbell Morrison <[email protected]>
Date:
Sat Feb 27 13:20:42 2016 +0000
Log message:
Added a sort key for the area table (doesn't do anything yet)
diffstat:
tables.my.sql | 3 ++-
tables.pg.sql | 3 ++-
web/dbsys.inc | 2 +-
web/mrbs_sql.inc | 3 ++-
web/report.php | 4 ++--
web/upgrade/49/mysql.sql | 10 ++++++++++
web/upgrade/49/pgsql.sql | 10 ++++++++++
7 files changed, 29 insertions(+), 6 deletions(-)
diffs (116 lines):
diff -r d9449994a06a -r 63f7695c2c89 tables.my.sql
--- a/tables.my.sql Fri Feb 19 17:26:06 2016 +0000
+++ b/tables.my.sql Sat Feb 27 13:20:42 2016 +0000
@@ -19,6 +19,7 @@
id int NOT NULL auto_increment,
disabled tinyint(1) DEFAULT 0 NOT NULL,
area_name varchar(30) CHARACTER SET utf8 COLLATE
utf8_general_ci,
+ sort_key varchar(30) CHARACTER SET utf8 COLLATE
utf8_general_ci DEFAULT '' NOT NULL,
timezone varchar(50) CHARACTER SET utf8 COLLATE
utf8_general_ci,
area_admin_email text CHARACTER SET utf8 COLLATE utf8_general_ci,
resolution int,
@@ -190,6 +191,6 @@
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
INSERT INTO mrbs_variables (variable_name, variable_content)
- VALUES ( 'db_version', '48');
+ VALUES ( 'db_version', '49');
INSERT INTO mrbs_variables (variable_name, variable_content)
VALUES ( 'local_db_version', '1');
diff -r d9449994a06a -r 63f7695c2c89 tables.pg.sql
--- a/tables.pg.sql Fri Feb 19 17:26:06 2016 +0000
+++ b/tables.pg.sql Sat Feb 27 13:20:42 2016 +0000
@@ -23,6 +23,7 @@
id serial primary key,
disabled smallint DEFAULT 0 NOT NULL,
area_name varchar(30),
+ sort_key varchar(30) DEFAULT '' NOT NULL,
timezone varchar(50),
area_admin_email text,
resolution int,
@@ -181,6 +182,6 @@
);
INSERT INTO mrbs_variables (variable_name, variable_content)
- VALUES ('db_version', '48');
+ VALUES ('db_version', '49');
INSERT INTO mrbs_variables (variable_name, variable_content)
VALUES ('local_db_version', '1');
diff -r d9449994a06a -r 63f7695c2c89 web/dbsys.inc
--- a/web/dbsys.inc Fri Feb 19 17:26:06 2016 +0000
+++ b/web/dbsys.inc Sat Feb 27 13:20:42 2016 +0000
@@ -23,7 +23,7 @@
}
-$db_schema_version = 48;
+$db_schema_version = 49;
$local_db_schema_version = 1;
// Include the abstraction configured to be used for the default MRBS
diff -r d9449994a06a -r 63f7695c2c89 web/mrbs_sql.inc
--- a/web/mrbs_sql.inc Fri Feb 19 17:26:06 2016 +0000
+++ b/web/mrbs_sql.inc Sat Feb 27 13:20:42 2016 +0000
@@ -1595,7 +1595,7 @@
$sql .= " AND R.disabled = 0" .
" AND A.disabled = 0";
}
- $sql .= " ORDER BY sort_key";
+ $sql .= " ORDER BY R.sort_key";
$res = sql_query($sql);
@@ -1662,6 +1662,7 @@
switch ($key)
{
case 'area_name':
+ case 'sort_key':
$sql_col[] = $key;
$sql_val[] = "'$area_name_q'";
break;
diff -r d9449994a06a -r 63f7695c2c89 web/report.php
--- a/web/report.php Fri Feb 19 17:26:06 2016 +0000
+++ b/web/report.php Sat Feb 27 13:20:42 2016 +0000
@@ -1436,12 +1436,12 @@
elseif ($sortby == "r")
{
// Order by Area, Room, Start date/time
- $sql .= " ORDER BY area_name, sort_key, start_time";
+ $sql .= " ORDER BY area_name, R.sort_key, start_time";
}
else
{
// Order by Start date/time, Area, Room
- $sql .= " ORDER BY start_time, area_name, sort_key";
+ $sql .= " ORDER BY start_time, area_name, R.sort_key";
}
// echo "<p>DEBUG: SQL: <tt> $sql </tt></p>\n";
diff -r d9449994a06a -r 63f7695c2c89 web/upgrade/49/mysql.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/upgrade/49/mysql.sql Sat Feb 27 13:20:42 2016 +0000
@@ -0,0 +1,10 @@
+-- $Id$
+
+-- Add a sort_key for the area table and populate it with the area_name.
+-- Just in case the area_name column has been extended, truncate the area_name
when copying it into the sort_key
+
+ALTER TABLE %DB_TBL_PREFIX%area
+ ADD COLUMN `sort_key` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci
DEFAULT '' NOT NULL AFTER `area_name`;
+
+UPDATE %DB_TBL_PREFIX%area
+ SET `sort_key`=SUBSTR(`area_name`, 1, 30);
diff -r d9449994a06a -r 63f7695c2c89 web/upgrade/49/pgsql.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/upgrade/49/pgsql.sql Sat Feb 27 13:20:42 2016 +0000
@@ -0,0 +1,10 @@
+-- $Id$
+
+-- Add a sort_key for the area table and populate it with the area_name.
+-- Just in case the area_name column has been extended, truncate the area_name
when copying it into the sort_key
+
+ALTER TABLE %DB_TBL_PREFIX%area
+ ADD COLUMN sort_key varchar(30) DEFAULT '' NOT NULL;
+
+UPDATE %DB_TBL_PREFIX%area
+ SET sort_key=SUBSTR(area_name, 1, 30);
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
