diff --git a/UPGRADE.txt b/UPGRADE.txt index c4e71c04fc..3ba95921ea 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -50,7 +50,7 @@ from 11.8 to 11.9 Disable it for PostgreSQL backends in order to avoid errors caused by updating integer columns with an empty string instead of NULL - (sipppeers,sipregs) + (sippeers, sipregs, ..). From 11.7 to 11.8: - The per console verbose level feature as previously implemented caused a diff --git a/configs/res_odbc.conf.sample b/configs/res_odbc.conf.sample index 581389fda1..035f38c84f 100644 --- a/configs/res_odbc.conf.sample +++ b/configs/res_odbc.conf.sample @@ -23,7 +23,8 @@ enabled => no ; (or /usr/local/etc/odbc.ini, on FreeBSD and similar systems). dsn => asterisk ; -; Username for connecting to the database. The user defaults to the context name if unspecified. +; Username for connecting to the database. The user defaults to the context +; name if unspecified. ;username => myuser ; ; Password for authenticating the user to the database. The default @@ -68,8 +69,9 @@ pre-connect => yes ; during realtime updates. Disabling this option causes empty column values to be ; stored as NULLs for non-text columns. ; Disable it for PostgreSQL backend in order to avoid errors caused by updating -; integer columns with an empty string instead of NULL (sipppeers,sipregs) -; NOTE: This option will be removed in asterisk 13. At that point, it will always behave as if it was set to 'no'. +; integer columns with an empty string instead of NULL (sippeers, sipregs, ..). +; NOTE: This option will be removed in asterisk 13. At that point, it will always +; behave as if it was set to 'no'. ;allow_empty_string_in_nontext => yes ; ; How long (in seconds) should we attempt to connect before considering the