diff options
author | Dave Lawrence <dlawrence@mozilla.com> | 2013-04-19 00:55:59 +0200 |
---|---|---|
committer | Dave Lawrence <dlawrence@mozilla.com> | 2013-04-19 00:55:59 +0200 |
commit | c69cbc8008696c82747b833bca5cfa2faf9c1594 (patch) | |
tree | 6611bbb98833e2081af78a454465424c1b035e05 /Bugzilla/DB | |
parent | 01848b6f328992497d8b25b3057893c086de7751 (diff) | |
parent | 2aecaaf29af1866367a362bbd57c6b5258d6440e (diff) | |
download | bugzilla-c69cbc8008696c82747b833bca5cfa2faf9c1594.tar.gz bugzilla-c69cbc8008696c82747b833bca5cfa2faf9c1594.tar.xz |
merged with bugzilla/4.2
Diffstat (limited to 'Bugzilla/DB')
-rw-r--r-- | Bugzilla/DB/Oracle.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Bugzilla/DB/Oracle.pm b/Bugzilla/DB/Oracle.pm index 7df2c09bb..644276898 100644 --- a/Bugzilla/DB/Oracle.pm +++ b/Bugzilla/DB/Oracle.pm @@ -550,7 +550,9 @@ sub bz_setup_database { . " RETURN NUMBER IS BEGIN RETURN LENGTH(COLUMN_NAME); END;"); # Create types for group_concat - $self->do("DROP TYPE T_GROUP_CONCAT"); + my $type_exists = $self->selectrow_array("SELECT 1 FROM user_types + WHERE type_name = 'T_GROUP_CONCAT'"); + $self->do("DROP TYPE T_GROUP_CONCAT") if $type_exists; $self->do("CREATE OR REPLACE TYPE T_CLOB_DELIM AS OBJECT " . "( p_CONTENT CLOB, p_DELIMITER VARCHAR2(256)" . ", MAP MEMBER FUNCTION T_CLOB_DELIM_ToVarchar return VARCHAR2" |