Forráskód Böngészése

Merge pull request #1657 from sp1d3rx/patch-3

speed improvements, removed unnecessary branching
Mike Smith 10 éve
szülő
commit
8c3e9c4fbf
1 módosított fájl, 9 hozzáadás és 15 törlés
  1. 9 15
      frameworks/Python/web2py/app/app/models/db.py

+ 9 - 15
frameworks/Python/web2py/app/app/models/db.py

@@ -17,24 +17,18 @@ myconf = AppConfig(reload=True)
 DATABASE = None
 DATABASE_URI = "mysql://benchmarkdbuser:benchmarkdbpass@localhost:3306/hello_world"
 
-if not request.env.web2py_runtime_gae:
-    ## if NOT running on Google App Engine use SQLite or other DB
-    db = DAL(DATABASE_URI, fake_migrate_all=True)
-    DATABASE = db
-else:
-    ## connect to Google BigTable (optional 'google:datastore://namespace')
-    db = DAL(DATABASE_URI, fake_migrate_all=True)
-    DATABASE = db
-    ## store sessions and tickets there
-    session.connect(request, response, db=db)
-    ## or store session in Memcache, Redis, etc.
-    ## from gluon.contrib.memdb import MEMDB
-    ## from google.appengine.api.memcache import Client
-    ## session.connect(request, response, db = MEMDB(Client()))
+db = DAL(DATABASE_URI, fake_migrate_all=True)
+DATABASE = db
+## store sessions and tickets there
+##session.connect(request, response, db=db)
+## or store session in Memcache, Redis, etc.
+## from gluon.contrib.memdb import MEMDB
+## from google.appengine.api.memcache import Client
+## session.connect(request, response, db = MEMDB(Client()))
 
 ## by default give a view/generic.extension to all actions from localhost
 ## none otherwise. a pattern can be 'controller/function.extension'
-response.generic_patterns = ['*'] if request.is_local else []
+response.generic_patterns = [] 
 
 db.define_table("world",
     Field("id"),