[freeside-commits] branch master updated. c7caf18eb75426b50715e3bf02c2a2f92e170b83

[Christopher Burger]

The branch, master has been updated
       via  c7caf18eb75426b50715e3bf02c2a2f92e170b83 (commit)
      from  ea963c68bda696def555b86a3b5a7410386ab92d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c7caf18eb75426b50715e3bf02c2a2f92e170b83
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Tue Jan 23 14:05:02 2018 -0500

    RT# 76398 - fixed sybase query for detecting tables and adding columns

diff --git a/FS/FS/cdr/Import.pm b/FS/FS/cdr/Import.pm
index aa5f5744f..c0c192f40 100644
--- a/FS/FS/cdr/Import.pm
+++ b/FS/FS/cdr/Import.pm
@@ -195,9 +195,7 @@ sub get_queries {
 
   #Check for freeside status table Sybase has not been tested
   my %dbi_check_statustable = (
-    'Sybase'  => "SELECT systables.name FROM sysobjects
-                  JOIN systables ON sysobjects.id = systables.id
-                  WHERE sysobjects.name LIKE '$info->{table}' AND systables.name = $info->{status_table}",
+    'Sybase'  => "SELECT * FROM sysobjects WHERE name = $info->{status_table}",
     'Pg'      => "SELECT * FROM information_schema.columns WHERE table_schema = 'public' AND table_name = '$info->{status_table}' AND column_name = '$info->{status_column}'",
   );
 
@@ -217,7 +215,7 @@ sub get_queries {
 
     #Check for freeside status column Sybase has not been tested
   my %dbi_create_statuscolumn = (
-    'Sybase'  => "ALTER TABLE $info->{table} ADD COLUMN $info->{status_column} $info->{status_column_info}",
+    'Sybase'  => "ALTER TABLE $info->{table} ADD $info->{status_column} $info->{status_column_info}",
     'Pg'      => "ALTER TABLE $info->{table} ADD COLUMN $info->{status_column} $info->{status_column_info}",
   );
 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cdr/Import.pm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)