Remove obsolete Oracle _insert_returning method

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / SQLMaker / Oracle.pm

diff --git a/lib/DBIx/Class/SQLMaker/Oracle.pm b/lib/DBIx/Class/SQLMaker/Oracle.pm
index d1ed9a2..715083a 100644 (file)
--- a/lib/DBIx/Class/SQLMaker/Oracle.pm
+++ b/lib/DBIx/Class/SQLMaker/Oracle.pm
@@ -1,10 +1,11 @@
 package # Hide from PAUSE
   DBIx::Class::SQLMaker::Oracle;
 
-use warnings;
-use strict;
+use Module::Runtime ();
+use Moo;
+use namespace::clean;
 
-use base qw( DBIx::Class::SQLMaker );
+extends 'DBIx::Class::SQLMaker';
 
 BEGIN {
   use DBIx::Class::Optional::Dependencies;
@@ -12,17 +13,19 @@ BEGIN {
     unless DBIx::Class::Optional::Dependencies->req_ok_for ('id_shortener');
 }
 
-sub new {
-  my $self = shift;
-  my %opts = (ref $_[0] eq 'HASH') ? %{$_[0]} : @_;
-  push @{$opts{special_ops}}, {
-    regex => qr/^prior$/i,
-    handler => '_where_field_PRIOR',
-  };
-
-  $self->next::method(\%opts);
+sub _build_converter_class {
+  Module::Runtime::use_module('DBIx::Class::SQLMaker::Converter::Oracle');
 }
 
+around _build_renderer_roles => sub {
+  my ($orig, $self) = (shift, shift);
+  (
+    'Data::Query::Renderer::SQL::Extension::ConnectBy',
+    'Data::Query::Renderer::SQL::Dialect::ReturnInto',
+    $self->$orig(@_),
+  );
+};
+
 sub _assemble_binds {
   my $self = shift;
   return map { @{ (delete $self->{"${_}_bind"}) || [] } } (qw/pre_select select from where oracle_connect_by group having order limit/);
@@ -92,7 +95,7 @@ sub _order_siblings_by {
     return wantarray ? ( $sql, @bind ) : $sql;
 }
 
-# we need to add a '=' only when PRIOR is used against a column directly
+# we need to add a '=' only when PRIOR is used against a column diretly
 # i.e. when it is invoked by a special_op callback
 sub _where_field_PRIOR {
   my ($self, $lhs, $op, $rhs) = @_;
@@ -177,7 +180,7 @@ sub _shorten_identifier {
     }
   }
 
-  # still too long - just start cutting proportionally
+  # still too long - just start cuting proportionally
   if ($concat_len > $max_trunc) {
     my $trim_ratio = $max_trunc / $concat_len;
 
@@ -201,57 +204,4 @@ sub _unqualify_colname {
   return $self->_shorten_identifier($self->next::method($fqcn));
 }
 
-#
-# Oracle has a different INSERT...RETURNING syntax
-#
-
-sub _insert_returning {
-  my ($self, $options) = @_;
-
-  my $f = $options->{returning};
-
-  my ($f_list, @f_names) = do {
-    if (! ref $f) {
-      (
-        $self->_quote($f),
-        $f,
-      )
-    }
-    elsif (ref $f eq 'ARRAY') {
-      (
-        (join ', ', map { $self->_quote($_) } @$f),
-        @$f,
-      )
-    }
-    elsif (ref $f eq 'SCALAR') {
-      (
-        $$f,
-        $$f,
-      )
-    }
-    else {
-      $self->throw_exception("Unsupported INSERT RETURNING option $f");
-    }
-  };
-
-  my $rc_ref = $options->{returning_container}
-    or $self->throw_exception('No returning container supplied for IR values');
-
-  @$rc_ref = (undef) x @f_names;
-
-  return (
-    ( join (' ',
-      $self->_sqlcase(' returning'),
-      $f_list,
-      $self->_sqlcase('into'),
-      join (', ', ('?') x @f_names ),
-    )),
-    map {
-      $self->{bindtype} eq 'columns'
-        ? [ $f_names[$_] => \$rc_ref->[$_] ]
-        : \$rc_ref->[$_]
-    } (0 .. $#f_names),
-  );
-}
-
 1;