              query = query[:-1]
          query = smart_str(query, self.charset) % tuple(args)
          self._guess_input_sizes([params])
          try:
              return Database.Cursor.execute(self, query,
                                             self._param_generator(params))
          except DatabaseError, e:
              # cx_Oracle <= 4.4.0 wrongly raises a DatabaseError for ORA-01400.
              if e.args[0].code == 1400 and not isinstance(e, IntegrityError):
                  e = IntegrityError(e.args[0])
              raise e
 
</s> remove             return Database.Cursor.executemany(self, query,
 </s> add             return self.cursor.executemany(query, </s> remove         row = Database.Cursor.fetchone(self)
 </s> add         row = self.cursor.fetchone() </s> remove         for value, desc in zip(row, self.description):
 </s> add         for value, desc in zip(row, self.cursor.description): </s> remove         # Necessary to retrieve decimal values without rounding error.
        cursor.numbersAsStrings = True
        # Default arraysize of 1 is highly sub-optimal.
        cursor.arraysize = 100
 </s> add  </s> remove class FormatStylePlaceholderCursor(Database.Cursor):
 </s> add class FormatStylePlaceholderCursor(object):
            return self.cursor.execute(query, self._param_generator(params))
              query = query[:-1]
          query = smart_str(query, self.charset) % tuple(args)
          self._guess_input_sizes([params])
          try:
            return self.cursor.execute(query, self._param_generator(params))
            return self.cursor.execute(query, self._param_generator(params))
          except DatabaseError, e:
              # cx_Oracle <= 4.4.0 wrongly raises a DatabaseError for ORA-01400.
              if e.args[0].code == 1400 and not isinstance(e, IntegrityError):
                  e = IntegrityError(e.args[0])
              raise e
keep keep keep keep replace replace keep keep keep keep keep
 Fixed #5543: callproc() and friends now work with Oracle and our FormatStylePlaceholderCursor.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9767 bcc190cf-cafb-0310-a4f2-bffc1f526a37 
django/db/backends/oracle/base.py