Commits

Waldemar Kornewald  committed 9d840a4 Merge

Automated merge with ssh://hg@bitbucket.org/wkornewald/djangoappengine

  • Participants
  • Parent commits 452d9de, 730c60f

Comments (0)

Files changed (2)

 class DatabaseOperations(NonrelDatabaseOperations):
     compiler_module = __name__.rsplit('.', 1)[0] + '.compiler'
 
+    def sql_flush(self, style, tables, sequences):
+        self.connection.flush()
+        return []
+
 class DatabaseClient(NonrelDatabaseClient):
     pass
 
 class DatabaseWrapper(NonrelDatabaseWrapper):
     def __init__(self, *args, **kwds):
         super(DatabaseWrapper, self).__init__(*args, **kwds)
-        self.features = DatabaseFeatures()
-        self.ops = DatabaseOperations()
+        self.features = DatabaseFeatures(self)
+        self.ops = DatabaseOperations(self)
         self.client = DatabaseClient(self)
         self.creation = DatabaseCreation(self)
         self.validation = DatabaseValidation(self)

File management/commands/flush.py

-#!/usr/bin/python2.4
-#
-# Copyright 2008 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import logging
-import os
-import sys
-
-from django.core.management.base import BaseCommand
-
-
-class Command(BaseCommand):
-    """Overrides the default Django flush command."""
-    help = 'Clears the current datastore and loads the initial fixture data.'
-
-    def run_from_argv(self, argv):
-        from django.db import connection
-        connection.flush()
-        from django.core.management import call_command
-        call_command('loaddata', 'initial_data')
-
-    def handle(self, *args, **kwargs):
-        self.run_from_argv(None)