[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.4-35-g48bbc77

[Alex Vandiver]

The branch, 3.9-trunk has been updated
       via  48bbc7723dada4d392b5d780468ffa0f1eb3300e (commit)
      from  4d570a9963515f1b94ebcdbe91835a731440ca5f (commit)

Summary of changes:
 Makefile.in                       |   14 +++-----------
 configure.ac                      |    7 +------
 etc/upgrade/3.1.0/acl.Informix    |    4 ----
 etc/upgrade/3.1.0/schema.Informix |   17 -----------------
 etc/upgrade/3.3.0/acl.Informix    |    4 ----
 lib/RT/Handle.pm                  |   10 +---------
 6 files changed, 5 insertions(+), 51 deletions(-)
 delete mode 100644 etc/upgrade/3.1.0/acl.Informix
 delete mode 100644 etc/upgrade/3.1.0/schema.Informix
 delete mode 100644 etc/upgrade/3.3.0/acl.Informix

- Log -----------------------------------------------------------------
commit 48bbc7723dada4d392b5d780468ffa0f1eb3300e
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Sep 30 14:31:05 2010 -0400

    Remove remaining traces of Informix and Sybase support

diff --git a/Makefile.in b/Makefile.in
index 679a2e7..5921438 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -175,17 +175,12 @@ SYSTEM_BINARIES		=	rt-attributes-viewer \
 				rt-validator
 
 
-ETC_FILES		=	acl.Informix \
-				acl.Pg \
+ETC_FILES		=	acl.Pg \
 				acl.Oracle \
 				acl.mysql \
-				acl.Sybase \
-				schema.Informix \
 				schema.Pg \
 				schema.Oracle \
-				schema.mysql-4.0 \
-				schema.mysql-4.1 \
-				schema.Sybase \
+				schema.mysql \
 				schema.SQLite \
 				initialdata
 
@@ -197,9 +192,7 @@ WEB_HANDLER		=	@WEB_HANDLER@
 
 #
 # DB_TYPE defines what sort of database RT trys to talk to
-# "mysql" is known to work.
-# "Pg" is known to work
-# "Informix" is known to work
+# "mysql", "Oracle", "Pg", and "SQLite" are known to work.
 
 DB_TYPE			=	@DB_TYPE@
 
@@ -211,7 +204,6 @@ DB_TYPE			=	@DB_TYPE@
 # For mysql, you probably want 'root'
 # For Pg, you probably want 'postgres' 
 # For Oracle, you want 'system'
-# For Informix, you want 'informix'
 
 DB_DBA			=	@DB_DBA@
 
diff --git a/configure.ac b/configure.ac
index 9d4cad4..b908c3d 100755
--- a/configure.ac
+++ b/configure.ac
@@ -120,7 +120,7 @@ AC_ARG_WITH(db-type,
 	    		   [sort of database RT will use (default: mysql) (mysql, Pg, Oracle and SQLite are valid)]), 
             DB_TYPE=$withval,
             DB_TYPE=mysql)
-if test "$DB_TYPE" != 'mysql' -a "$DB_TYPE" != 'Pg' -a "$DB_TYPE" != 'SQLite' -a "$DB_TYPE" != 'Oracle' -a "$DB_TYPE" != 'Informix' -a "$DB_TYPE" != 'Sybase' ; then
+if test "$DB_TYPE" != 'mysql' -a "$DB_TYPE" != 'Pg' -a "$DB_TYPE" != 'SQLite' -a "$DB_TYPE" != 'Oracle' ; then
 	AC_MSG_ERROR([Only Oracle, Pg, mysql and SQLite are valid db types])
 fi
 AC_SUBST(DB_TYPE)
@@ -131,11 +131,6 @@ if test "$DB_TYPE" = 'Oracle'; then
 	DATABASE_ENV_PREF="\$ENV{'ORACLE_HOME'} = '$ORACLE_HOME';"
 fi
 
-dnl DATABASE_ENV_PREF
-if test "$DB_TYPE" = 'Sybase'; then
-	test "x$SYBASE" = 'x' && AC_MSG_ERROR([Please declare the SYBASE_HOME environment variable])
-	DATABASE_ENV_PREF="\$ENV{'SYBASE'} = '$SYBASE';"
-fi
 AC_SUBST(DATABASE_ENV_PREF)
 
 dnl DB_HOST
diff --git a/etc/upgrade/3.1.0/acl.Informix b/etc/upgrade/3.1.0/acl.Informix
deleted file mode 100644
index 73c16ae..0000000
--- a/etc/upgrade/3.1.0/acl.Informix
+++ /dev/null
@@ -1,4 +0,0 @@
-sub acl {
-    return ();
-}
-1;
diff --git a/etc/upgrade/3.1.0/schema.Informix b/etc/upgrade/3.1.0/schema.Informix
deleted file mode 100644
index 722eb70..0000000
--- a/etc/upgrade/3.1.0/schema.Informix
+++ /dev/null
@@ -1,17 +0,0 @@
-CREATE TABLE Attributes (
-  	id 		SERIAL,
-	Name 			VARCHAR(255) DEFAULT '' NOT NULL,
-	Description 		VARCHAR(255) DEFAULT NULL,
-  	Content 	BYTE,
-	ContentType	VARCHAR(16),
-	ObjectType	VARCHAR(25) NOT NULL,
-	ObjectId	INTEGER DEFAULT 0 NOT NULL,
-	Creator 	INTEGER DEFAULT 0 NOT NULL,
-  	Created 	DATETIME YEAR TO SECOND,
-	LastUpdatedBy	INTEGER DEFAULT 0 NOT NULL,
-	LastUpdated	DATETIME YEAR TO SECOND,
-        PRIMARY KEY (id)
-); 
-
-CREATE INDEX Attributes1 on Attributes(Name);
-CREATE INDEX Attributes2 on Attributes(ObjectType, ObjectId);
diff --git a/etc/upgrade/3.3.0/acl.Informix b/etc/upgrade/3.3.0/acl.Informix
deleted file mode 100644
index 73c16ae..0000000
--- a/etc/upgrade/3.3.0/acl.Informix
+++ /dev/null
@@ -1,4 +0,0 @@
-sub acl {
-    return ();
-}
-1;
diff --git a/lib/RT/Handle.pm b/lib/RT/Handle.pm
index b183dea..8bca0d8 100755
--- a/lib/RT/Handle.pm
+++ b/lib/RT/Handle.pm
@@ -201,10 +201,6 @@ sub SystemDSN {
         # with postgres, you want to connect to template1 database
         $dsn =~ s/dbname=\Q$db_name/dbname=template1/;
     }
-    elsif ( $db_type eq 'Informix' ) {
-        # with Informix, you want to connect sans database:
-        $dsn =~ s/Informix:\Q$db_name/Informix:/;
-    }
     return $dsn;
 }
 
@@ -341,10 +337,6 @@ sub CreateDatabase {
         $status = $dbh->do("CREATE DATABASE $db_name WITH ENCODING='UNICODE' TEMPLATE template0")
             || $dbh->do("CREATE DATABASE $db_name TEMPLATE template0");
     }
-    elsif ( $db_type eq 'Informix' ) {
-        local $ENV{'DB_LOCALE'} = 'en_us.utf8';
-        $status = $dbh->do("CREATE DATABASE $db_name WITH BUFFERED LOG");
-    }
     else {
         $status = $dbh->do("CREATE DATABASE $db_name");
     }
@@ -370,7 +362,7 @@ sub DropDatabase {
     my $db_type = RT->Config->Get('DatabaseType');
     my $db_name = RT->Config->Get('DatabaseName');
 
-    if ( $db_type eq 'Oracle' || $db_type eq 'Informix' ) {
+    if ( $db_type eq 'Oracle' ) {
         my $db_user = RT->Config->Get('DatabaseUser');
         my $status = $dbh->do( "DROP USER $db_user CASCADE" );
         unless ( $status ) {

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