[svn-commits] tilghman: branch 1.6.2 r272577 - in /branches/1.6.2: ./ doc/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Jun 25 15:20:28 2010
New Revision: 272577

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=272577
Log:
Merged revisions 272568 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r272568 | tilghman | 2010-06-25 15:18:47 -0500 (Fri, 25 Jun 2010) | 12 lines
  
  Merged revisions 272562 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r272562 | tilghman | 2010-06-25 15:17:37 -0500 (Fri, 25 Jun 2010) | 5 lines
    
    Make the structure of the table specified before match the queries and results.
    
    (closes issue #17557)
     Reported by: cmaj
  ........
................

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/doc/voicemail_odbc_postgresql.txt

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/doc/voicemail_odbc_postgresql.txt
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/doc/voicemail_odbc_postgresql.txt?view=diff&rev=272577&r1=272576&r2=272577
==============================================================================
--- branches/1.6.2/doc/voicemail_odbc_postgresql.txt (original)
+++ branches/1.6.2/doc/voicemail_odbc_postgresql.txt Fri Jun 25 15:20:28 2010
@@ -253,7 +253,7 @@
 11) Just as a sanity check, make sure you check the voicemessages table via the
 isql utility.
 
-[jsmith2 at localhost ODBC]$ echo "SELECT id, msgnum, dir, duration FROM voicemessages WHERE msgnum = 1" | isql testing
+[jsmith2 at localhost ODBC]$ echo "SELECT uniqueid, msgnum, dir, duration FROM voicemessages WHERE msgnum = 1" | isql testing
 +---------------------------------------+
 | Connected!                            |
 |                                       |
@@ -263,7 +263,7 @@
 |                                       |
 +---------------------------------------+
 SQL> +------------+------------+---------------------------------------------------------------------------------+---------------------+
-| id         | msgnum     | dir                                                                             | duration            |
+| uniqueid   | msgnum     | dir                                                                             | duration            |
 +------------+------------+---------------------------------------------------------------------------------+---------------------+
 +------------+------------+---------------------------------------------------------------------------------+---------------------+
 SQLRowCount returns 0
@@ -371,9 +371,9 @@
        \q to quit
 
 asterisk=# SELECT * FROM voicemessages;
- id | msgnum |                       dir                        | context | macrocontext |       callerid        |  origtime  | duration | mailboxuser | mailboxcontext | recording | label | read | sip_id | pabx_id | iax_id 
-----+--------+--------------------------------------------------+---------+--------------+-----------------------+------------+----------+-------------+----------------+-----------+-------+------+--------+---------+--------
- 26 |      0 | /var/spool/asterisk/voicemail/odbctest/101/INBOX | odbc    |              | "linksys" <linksys> | 1167794179 | 7        | 101         | odbctest       | 16599     |       | f    |        |         |       
+ uniqueid | msgnum |                       dir                        | context | macrocontext |       callerid        |  origtime  | duration | mailboxuser | mailboxcontext | recording | label | read | sip_id | pabx_id | iax_id 
+----------+--------+--------------------------------------------------+---------+--------------+-----------------------+------------+----------+-------------+----------------+-----------+-------+------+--------+---------+--------
+       26 |      0 | /var/spool/asterisk/voicemail/odbctest/101/INBOX | odbc    |              | "linksys" <linksys> | 1167794179 | 7        | 101         | odbctest       | 16599     |       | f    |        |         |       
 (1 row)
 
 Did you notice the the recording column is just a number?  When a recording