Issue #1908: Updating sql drivers to use NOT NULL and DEFAULT correct…

…ly, cannot use bind because it will quote variables with inverted commas in sql query.
RotherOSS · Dec 22, 2022 · eac8faa · eac8faa
1 parent 9df8b6c
commit eac8faa
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 39 deletions.
diff --git a/Kernel/System/MigrateFromOTRS/CloneDB/Driver/mysql.pm b/Kernel/System/MigrateFromOTRS/CloneDB/Driver/mysql.pm
@@ -269,6 +269,7 @@ sub TranslateColumnInfos {
 }
 
 # Alter table add column
+# Note: add also custom columns which not belongs to standard
 sub AlterTableAddColumn {
     my ( $Self, %Param ) = @_;
 
@@ -285,32 +286,23 @@ sub AlterTableAddColumn {
     }
 
     my %ColumnInfos = %{ $Param{ColumnInfos} };
-    my $SQL         = qq{ALTER TABLE ? ADD ? ?};
-
-    my @Bind = (
-        \$Param{Table},
-        \$Param{Column},
-        \$ColumnInfos{DATA_TYPE},
-    );
+    my $SQL         = qq{ALTER TABLE $Param{Table} ADD $Param{Column} $ColumnInfos{DATA_TYPE}};
 
     if ( $ColumnInfos{LENGTH} ) {
-        $SQL .= " (?)";
-        push(@Bind, \$ColumnInfos{LENGTH});
+        $SQL .= " ($ColumnInfos{LENGTH})";
     }
 
     if ( $ColumnInfos{COLUMN_DEFAULT} ) {
-        $SQL .= qq{ DEFAULT "?"};
-        push(@Bind, \$ColumnInfos{COLUMN_DEFAULT});
+        $SQL .= " DEFAULT '$ColumnInfos{COLUMN_DEFAULT}'";
     }
 
     # IS_NULLABLE is either YES or NO
     if ( $ColumnInfos{IS_NULLABLE} eq "NO" ) {
-        $SQL .= ' NOT NULL';
+        $SQL .= " NOT NULL";
     }
 
     my $Success = $Param{DBObject}->Do(
         SQL  => $SQL,
-        Bind => \@Bind,
     );
 
     if ( !$Success ) {

diff --git a/Kernel/System/MigrateFromOTRS/CloneDB/Driver/oracle.pm b/Kernel/System/MigrateFromOTRS/CloneDB/Driver/oracle.pm
@@ -354,6 +354,7 @@ sub TranslateColumnInfos {
 }
 
 # Alter table add column
+# Note: add also custom columns which not belongs to standard
 sub AlterTableAddColumn {
     my ( $Self, %Param ) = @_;
 
@@ -370,32 +371,23 @@ sub AlterTableAddColumn {
     }
 
     my %ColumnInfos = %{ $Param{ColumnInfos} };
-    my $SQL         = qq{ALTER TABLE ? ADD ? ?};
-
-    my @Bind = (
-        \$Param{Table},
-        \$Param{Column},
-        \$ColumnInfos{DATA_TYPE},
-    );
+    my $SQL         = qq{ALTER TABLE $Param{Table} ADD $Param{Column} $ColumnInfos{DATA_TYPE}};
 
     if ( $ColumnInfos{LENGTH} ) {
-        $SQL .= " (?)";
-        push(@Bind, \$ColumnInfos{LENGTH});
+        $SQL .= " ($ColumnInfos{LENGTH})";
     }
 
     if ( $ColumnInfos{COLUMN_DEFAULT} ) {
-        $SQL .= qq{ DEFAULT "?"};
-        push(@Bind, \$ColumnInfos{COLUMN_DEFAULT});
+        $SQL .= " DEFAULT '$ColumnInfos{COLUMN_DEFAULT}'";
     }
 
     # IS_NULLABLE is either YES or NO
     if ( $ColumnInfos{IS_NULLABLE} eq "NO" ) {
-        $SQL .= ' NOT NULL';
+        $SQL .= " NOT NULL";
     }
 
     my $Success = $Param{DBObject}->Do(
         SQL  => $SQL,
-        Bind => \@Bind,
     );
 
     if ( !$Success ) {

diff --git a/Kernel/System/MigrateFromOTRS/CloneDB/Driver/postgresql.pm b/Kernel/System/MigrateFromOTRS/CloneDB/Driver/postgresql.pm
@@ -324,6 +324,7 @@ sub TranslateColumnInfos {
 }
 
 # Alter table add column
+# Note: add also custom columns which not belongs to standard
 sub AlterTableAddColumn {
     my ( $Self, %Param ) = @_;
 
@@ -340,32 +341,23 @@ sub AlterTableAddColumn {
     }
 
     my %ColumnInfos = %{ $Param{ColumnInfos} };
-    my $SQL         = qq{ALTER TABLE ? ADD ? ?};
-
-    my @Bind = (
-        \$Param{Table},
-        \$Param{Column},
-        \$ColumnInfos{DATA_TYPE},
-    );
+    my $SQL         = qq{ALTER TABLE $Param{Table} ADD $Param{Column} $ColumnInfos{DATA_TYPE}};
 
     if ( $ColumnInfos{LENGTH} ) {
-        $SQL .= " (?)";
-        push(@Bind, \$ColumnInfos{LENGTH});
+        $SQL .= " ($ColumnInfos{LENGTH})";
     }
 
     if ( $ColumnInfos{COLUMN_DEFAULT} ) {
-        $SQL .= qq{ DEFAULT "?"};
-        push(@Bind, \$ColumnInfos{COLUMN_DEFAULT});
+        $SQL .= " DEFAULT '$ColumnInfos{COLUMN_DEFAULT}'";
     }
 
     # IS_NULLABLE is either YES or NO
     if ( $ColumnInfos{IS_NULLABLE} eq "NO" ) {
-        $SQL .= ' NOT NULL';
+        $SQL .= " NOT NULL";
     }
 
     my $Success = $Param{DBObject}->Do(
         SQL  => $SQL,
-        Bind => \@Bind,
     );
 
     if ( !$Success ) {