merging

Author: Stephanie Reeder

requirements.txt

@@ -1,6 +1,13 @@
 six
 sqlalchemy
-geoalchemy2
+geoalchemy
+Change line #242 in geoalchemy/base.py
+from:
+class SpatialComparator(ColumnProperty.ColumnComparator):
+to :
+class SpatialComparator(ColumnProperty.Comparator):
+
+shapely
 
 matplotlib
 dateutils

src/Examples/Sample.py

@@ -22,7 +22,7 @@
 #connect to database
 #createconnection (dbtype, servername, dbname, username, password)
 #session_factory = dbconnection.createConnection('mysql', 'localhost', 'odm2', 'ODM', 'odm')
-session_factory = dbconnection.createConnection('mysql', 'jws.uwrl.usu.edu', 'odm2', 'ODM', 'ODM123!!', 2)
+session_factory = dbconnection.createConnection('sqlite', '/Users/stephanie/DEV/DBs/ODM2.sqlite', 2.0)
 # session_factory= dbconnection.createConnection('mssql')
 
 
@@ -49,7 +49,13 @@
 for x in allPeople:
     print x.PersonFirstName + " " + x.PersonLastName
 
-
+try:
+    print "\n-------- Information about an Affiliation ---------"
+    allaff = read.getAllAffiliations()
+    for x in allaff:
+        print x.PersonObj.PersonFirstName + ": " + str(x.OrganizationID)
+except Exception as e:
+    print "Unable to demo getAllAffiliations", e
 
 # Get all of the SamplingFeatures from the database that are Sites
 try:
@@ -93,7 +99,7 @@
     newsf.SamplingFeatureTypeCV=sf.SamplingFeatureTypeCV
     newsf.SamplingFeatureUUID= sf.SamplingFeatureUUID+"2"
     session.add(newsf)
-    session.commit()
+    #session.commit()
     print "new sampling feature added to database", newsf
 
 except Exception as e :

src/api/ODM2/apiCustomType.py

@@ -1,6 +1,6 @@
 from sqlalchemy import func
-from sqlalchemy.sql.expression import FunctionElement
-from sqlalchemy.types import UserDefinedType
+from sqlalchemy.sql.expression import FunctionElement, ClauseElement, Executable
+#from sqlalchemy.types import UserDefinedType
 from sqlalchemy.ext.compiler import compiles
 
 
@@ -9,13 +9,17 @@
 # function to pull from the database
 def compiles_as_bound(cls):
 
+    @compiles(cls)
+    def compile_function(element, compiler, **kw):
+        return None
+
     @compiles(cls, 'postgresql')
     def compile_function(element, compiler, **kw):
         val = "%s(%s)"%(element.name, compiler.process(element.clauses.clauses[0]))
         #ST_AsText("\"ODM2\".\"SamplingFeatures\".\"FeatureGeometry\"")
         return val
 
-    @compiles(cls)#, 'mysql')
+    @compiles(cls, 'mysql')
     def compile_function(element, compiler, **kw):
         val="%s(%s)"%(element.name.lower().split('_')[1], compiler.process(element.clauses.clauses[0]))
         #astext("`ODM2`.`SamplingFeatures`.`FeatureGeometry`")
@@ -24,12 +28,15 @@ def compile_function(element, compiler, **kw):
 
     @compiles(cls, 'sqlite')
     def compile_function(element, compiler, **kw):
-        return "%s(%s)"%(element.name.split('_')[-1], compiler.process(element.clauses.clauses[0]))
-        #return ST_AsText(samplingfeatures.featuregeometry)
+        #ST_AsText(samplingfeatures.featuregeometry)
+        #assuming the user is using spatialite
+        #return "%s(%s)"%(element.name.split('_')[-1], compiler.process(element.clauses.clauses[0]))
+        #what if user does not have a spatial db?
+        return "%s"%compiler.process(element.clauses.clauses[0])
 
     @compiles(cls, 'mssql')
     def compile_function(element, compiler, **kw):
-        #[SamplingFeatures_1].[FeatureGeometry].STAsText()
+        #[SamplingFeatures].[FeatureGeometry].STAsText()
         return "%s.%s()" % (compiler.process(element.clauses.clauses[0]), element.name.replace('_', '') )
 
     return cls
@@ -55,23 +62,30 @@ def compile_function(element, compiler, **kw):
         # GeomFromText("POINT(30 10)")
         # GeomFromText(:featuregeometry)
 
-        val = "%s(%s)"%(name, element.clauses.clauses[0])
+        val = "%s(%s)"%(name, compiler.process(element.bindelement))
         return val
 
     @compiles(cls, 'sqlite')
     def compile_function(element, compiler, **kw):
         name= element.name.split('_')[-1]
         #return "%s(%s)" % (element.name.replace('_', ''), "'POINT (30 10)'")
+        #assuming the user is using spatialite
+        #return "%s(%s)"%(name, "'POINT(30 10)'")
 
-        return "%s(%s)"%(name, "'POINT(30 10)'")
+        #what if user does not have a spatial?
+# >>> self.bindtemplate
+# '?'
+# (BindParameter('featuregeometry', None, type_=Geometry()),)
+# >>> dialect.paramstyle
+        #print compiler.bindtemplate
+        return "%s(%s)"%(name, '')
 
     @compiles(cls, 'mssql')
     def compile_function(element, compiler, **kw):
         #return "Geometry::%s(%s, 0)"%(element.name.replace('_', ''), "'POINT (30 10)'")
         name = "Geometry::%s" % element.name.replace('_', '')
-        return "%s(%s,0)"%(name, "'POINT(30 10)'")
-
 
+        return "%s(%s,0)"%(name, "'POINT(30 10)'")
 
     return cls
 
@@ -81,6 +95,8 @@ def compile_function(element, compiler, **kw):
 class ST_GeomFromText(FunctionElement):
     name = "ST_GeomFromText"
 
+
+
 @compiles_as_bound
 class ST_AsText(FunctionElement):
     name = 'ST_AsText'
@@ -89,7 +105,8 @@ class ST_AsText(FunctionElement):
 class ST_AsBinary(FunctionElement):
     name = 'ST_AsBinary'
 
-from sqlalchemy import String, type_coerce
+
+
 class Geometry(GeometryBase):
 
     def column_expression(self, col):
@@ -99,21 +116,17 @@ def column_expression(self, col):
         return value
 
     def bind_expression(self, bindvalue):
-
-        #mysql, sqlite
+        val = None
+        # mysql, sqlite
         val = func.GeomFromText(bindvalue, type_=self)
 
-        #postgresql
-        #val = func.ST_GeomFromText(bindvalue, type_=self)
-        #mssql
+        # postgresql
+        # val = func.ST_GeomFromText(bindvalue, type_=self)
+        # mssql
         if val is None:
             val = ST_GeomFromText(bindvalue, type_=self)
         return val
 
 
 
 
-
-
-
-