<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15842] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15842">15842</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-12-08 10:37:48 -0600 (Tue, 08 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>change name of 'key' field due to reserved name in sql</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_commandsmod_commandsc">freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_sqldbc">freeswitch/trunk/src/switch_core_sqldb.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodapplicationsmod_commandsmod_commandsc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (15841 => 15842)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2009-12-08 07:20:58 UTC (rev 15841)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2009-12-08 16:37:48 UTC (rev 15842)
</span><span class="lines">@@ -3012,24 +3012,24 @@
</span><span class="cx"> if (end_of(command) == 's') {
</span><span class="cx"> end_of(command) = '\0';
</span><span class="cx"> }
</span><del>- sprintf(sql, "select type, name, key from interfaces where type = '%s' order by type,name", command);
</del><ins>+ sprintf(sql, "select type, name, ikey from interfaces where type = '%s' order by type,name", command);
</ins><span class="cx"> } else if (!strncasecmp(command, "module", 6)) {
</span><span class="cx"> if (argv[1]) {
</span><del>- sprintf(sql, "select distinct type, name, key, filename from interfaces where key = '%s' order by type,name", argv[1]);
</del><ins>+ sprintf(sql, "select distinct type, name, ikey, filename from interfaces where key = '%s' order by type,name", argv[1]);
</ins><span class="cx"> } else {
</span><del>- sprintf(sql, "select distinct type, name, key, filename from interfaces order by type,name");
</del><ins>+ sprintf(sql, "select distinct type, name, ikey, filename from interfaces order by type,name");
</ins><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(command, "interfaces")) {
</span><del>- sprintf(sql, "select type, name, key from interfaces order by type,name");
</del><ins>+ sprintf(sql, "select type, name, ikey from interfaces order by type,name");
</ins><span class="cx"> } else if (!strcasecmp(command, "interface_types")) {
</span><span class="cx"> sprintf(sql, "select type,count(type) as total from interfaces group by type order by type");
</span><span class="cx"> } else if (!strcasecmp(command, "tasks")) {
</span><span class="cx"> sprintf(sql, "select * from %s", command);
</span><span class="cx"> } else if (!strcasecmp(command, "application") || !strcasecmp(command, "api")) {
</span><span class="cx"> if (argv[1] && strcasecmp(argv[1], "as")) {
</span><del>- sprintf(sql, "select name, description, syntax, key from interfaces where type = '%s' and description != '' and name = '%s' order by type,name", command, argv[1]);
</del><ins>+ sprintf(sql, "select name, description, syntax, ikey from interfaces where type = '%s' and description != '' and name = '%s' order by type,name", command, argv[1]);
</ins><span class="cx"> } else {
</span><del>- sprintf(sql, "select name, description, syntax, key from interfaces where type = '%s' and description != '' order by type,name", command);
</del><ins>+ sprintf(sql, "select name, description, syntax, ikey from interfaces where type = '%s' and description != '' order by type,name", command);
</ins><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(command, "calls")) {
</span><span class="cx"> sprintf(sql, "select * from calls order by call_created_epoch");
</span><span class="lines">@@ -3087,10 +3087,10 @@
</span><span class="cx"> holder.print_title = 0;
</span><span class="cx"> if ((cmdname = strchr(command, ' ')) && strcasecmp(cmdname, "as")) {
</span><span class="cx"> *cmdname++ = '\0';
</span><del>- switch_snprintf(sql, sizeof(sql) - 1, "select name, syntax, description, key from interfaces where type = 'api' and name = '%s' order by name",
</del><ins>+ switch_snprintf(sql, sizeof(sql) - 1, "select name, syntax, description, ikey from interfaces where type = 'api' and name = '%s' order by name",
</ins><span class="cx"> cmdname);
</span><span class="cx"> } else {
</span><del>- switch_snprintf(sql, sizeof(sql) - 1, "select name, syntax, description, key from interfaces where type = 'api' order by name");
</del><ins>+ switch_snprintf(sql, sizeof(sql) - 1, "select name, syntax, description, ikey from interfaces where type = 'api' order by name");
</ins><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(command, "nat_map")) {
</span><span class="cx"> switch_snprintf(sql, sizeof(sql) - 1,
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_sqldbc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_sqldb.c (15841 => 15842)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_sqldb.c 2009-12-08 07:20:58 UTC (rev 15841)
+++ freeswitch/trunk/src/switch_core_sqldb.c 2009-12-08 16:37:48 UTC (rev 15842)
</span><span class="lines">@@ -1067,7 +1067,7 @@
</span><span class="cx"> const char *filename = switch_event_get_header_nil(event, "filename");
</span><span class="cx"> if (!zstr(type) && !zstr(name)) {
</span><span class="cx"> sql =
</span><del>- switch_mprintf("insert into interfaces (type,name,description,syntax,key,filename,hostname) values('%q','%q','%q','%q','%q','%q','%q')",
</del><ins>+ switch_mprintf("insert into interfaces (type,name,description,syntax,ikey,filename,hostname) values('%q','%q','%q','%q','%q','%q','%q')",
</ins><span class="cx"> type, name, switch_str_nil(description), switch_str_nil(syntax),
</span><span class="cx"> switch_str_nil(key), switch_str_nil(filename), switch_core_get_variable("hostname")
</span><span class="cx"> );
</span><span class="lines">@@ -1211,7 +1211,7 @@
</span><span class="cx"> " type VARCHAR(4096),\n"
</span><span class="cx"> " name VARCHAR(4096),\n"
</span><span class="cx"> " description VARCHAR(4096),\n"
</span><del>- " key VARCHAR(4096),\n"
</del><ins>+ " ikey VARCHAR(4096),\n"
</ins><span class="cx"> " filename VARCHAR(4096),\n"
</span><span class="cx"> " syntax VARCHAR(4096),\n"
</span><span class="cx"> " hostname VARCHAR(4096)\n"
</span><span class="lines">@@ -1307,7 +1307,7 @@
</span><span class="cx"> char *err;
</span><span class="cx"> switch_cache_db_test_reactive(dbh, "select hostname from channels", "DROP TABLE channels", create_channels_sql);
</span><span class="cx"> switch_cache_db_test_reactive(dbh, "select hostname from calls", "DROP TABLE calls", create_calls_sql);
</span><del>- switch_cache_db_test_reactive(dbh, "select hostname from interfaces", "DROP TABLE interfaces", create_interfaces_sql);
</del><ins>+ switch_cache_db_test_reactive(dbh, "select ikey from interfaces", "DROP TABLE interfaces", create_interfaces_sql);
</ins><span class="cx"> switch_cache_db_test_reactive(dbh, "select hostname from tasks", "DROP TABLE tasks", create_tasks_sql);
</span><span class="cx">
</span><span class="cx"> switch_cache_db_execute_sql(dbh, "begin;delete from channels where hostname='';delete from channels where hostname='';commit;", &err);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>