Added short_effects for no-effect moves.

[zzz-pokedex.git] / pokedex / db / __init__.py

diff --git a/pokedex/db/__init__.py b/pokedex/db/__init__.py
index ced519b..99e058b 100644 (file)
--- a/pokedex/db/__init__.py
+++ b/pokedex/db/__init__.py
@@ -1,13 +1,24 @@
+import pkg_resources
+

 from sqlalchemy import MetaData, Table, create_engine, orm
 
 from .tables import metadata
 
 from sqlalchemy import MetaData, Table, create_engine, orm
 
 from .tables import metadata
 

-def connect(uri, **kwargs):
+def connect(uri=None, **kwargs):

     """Connects to the requested URI.  Returns a session object.
 
     """Connects to the requested URI.  Returns a session object.
 

+    With the URI omitted, attempts to connect to a default SQLite database
+    contained within the package directory.
+

     Calling this function also binds the metadata object to the created engine.
     """
 
     Calling this function also binds the metadata object to the created engine.
     """
 

+    # Default to a URI within the package, which was hopefully created at some point
+    if not uri:
+        sqlite_path = pkg_resources.resource_filename('pokedex',
+                                                      'data/pokedex.sqlite')
+        uri = 'sqlite:///' + sqlite_path
+

     ### Do some fixery for MySQL
     if uri[0:5] == 'mysql':
         # MySQL uses latin1 for connections by default even if the server is
     ### Do some fixery for MySQL
     if uri[0:5] == 'mysql':
         # MySQL uses latin1 for connections by default even if the server is