Merge commit '119e7840ded581d20c61d20b968be86a61aaeec2'

Author: ymph

rdflib_sqlalchemy/SQLAlchemy.py

@@ -5,10 +5,12 @@
 import logging
 import sqlalchemy
 import hashlib
-from rdflib import BNode
-from rdflib import Literal
-from rdflib import RDF
-from rdflib import URIRef
+from rdflib import (
+	BNode,
+	Literal,
+	RDF,
+	URIRef
+)
 from rdflib.graph import Graph
 from rdflib.graph import QuotedGraph
 from rdflib.store import Store  # , NodePickler
@@ -231,7 +233,7 @@ def createTerm(
                 rt = Literal(termString, objLanguage)
                 store.literalCache[((termString, objLanguage))] = rt
             elif objDatatype and not objLanguage:
-                rt = Literal(termString, objDatatype)
+                rt = Literal(termString, datatype=objDatatype)
                 store.literalCache[((termString, objDatatype))] = rt
             elif not objLanguage and not objDatatype:
                 rt = Literal(termString)
@@ -903,7 +905,7 @@ def __repr__(self):
                     "contexts, %s classification assertions, " +
                     "%s quoted statements, %s property/value " +
                     "assertions, and %s other assertions>" % (
-                        len([c for c in self.contexts()]),
+                        len([ctx for ctx in self.contexts()]),
                         typeLen, quotedLen, literalLen, assertedLen))
         except Exception:
             return "<Partitioned SQL N3 Store>"

rdflib_sqlalchemy/__init__.py

@@ -49,8 +49,3 @@ def registerplugins():
     plugin.register(
         'SQLAlchemy', Store,
         'rdflib_sqlalchemy.SQLAlchemy', 'SQLAlchemy')
-
-    # # Work in progress
-    # plugin.register(
-    #     'SQLAlchemyBase', store.Store,
-    #     'rdflib_sqlalchemy.SQLAlchemyBase', 'SQLAlchemy')

setup.py

@@ -92,7 +92,7 @@ def find_version(filename):
     }
 )
 
-install_requires = ["rdflib>=3.4.1-dev",
+install_requires = ["rdflib>=4.0",
                     "SQLAlchemy"]
 
 if sys.version_info[0] >= 3:

test/__init__.py

@@ -3,12 +3,3 @@
 
 plugin.register('SQLAlchemy', store.Store,
         'rdflib_sqlalchemy.SQLAlchemy', 'SQLAlchemy')
-
-plugin.register('SQLAlchemyASS', store.Store,
-        'rdflib_sqlalchemy.SQLAlchemyASS', 'SQLAlchemy')
-
-plugin.register('SQLAlchemyBase', store.Store,
-        'rdflib_sqlalchemy.SQLAlchemyBase', 'SQLAlchemy')
-
-plugin.register('SQLAlchemyFOPL', store.Store,
-        'rdflib_sqlalchemy.SQLAlchemyFOPL', 'SQLAlchemy')

test/test.py

@@ -1,4 +1,4 @@
-from rdflib import Graph, BNode, Literal, URIRef, RDFS, RDF, plugin
+from rdflib import Graph, BNode, Literal, URIRef, RDFS, RDF, plugin, Namespace
 from rdflib.store import Store
 import os
 
@@ -7,27 +7,54 @@
 
 
 def investigate_len_issue():
+    import shutil, commands
     store = plugin.get('SQLAlchemy', Store)(
         identifier=URIRef("rdflib_test"),
         configuration=Literal("sqlite:///%(here)s/development.sqlite" % {
                                                         "here": os.getcwd()}))
-    g = Graph(store)
-    print(len(g))
+    g0 = Graph('Sleepycat')
+    g0.open('/tmp/foo', create=True)
+    print("Len g0 on opening: %s\n" % len(g0))
+    g1 = Graph(store)
+    print("Len g1 on opening: %s\n" % len(g1))
     statementId = BNode()
-    g.add((statementId, RDF.type, RDF.Statement))
-    g.add((statementId, RDF.subject,
+    print("Adding %s\n\t%s\n\t%s\n" % (statementId, RDF.type, RDF.Statement))
+    g0.add((statementId, RDF.type, RDF.Statement))
+    g1.add((statementId, RDF.type, RDF.Statement))
+    print("Adding %s\n\t%s\n\t%s\n" % (statementId, RDF.subject,
            URIRef(u'http://rdflib.net/store/ConjunctiveGraph')))
-    g.add((statementId, RDF.predicate, RDFS.label))
-    g.add((statementId, RDF.object, Literal("Conjunctive Graph")))
-    print(len(g))
-    for s, p, o in g:
-        print(type(s))
-
-    for s, p, o in g.triples((None, RDF.object, None)):
-        print(o)
-
-    g.remove((statementId, RDF.type, RDF.Statement))
-    print(len(g))
+    g0.add((statementId, RDF.subject,
+           URIRef(u'http://rdflib.net/store/ConjunctiveGraph')))
+    g1.add((statementId, RDF.subject,
+           URIRef(u'http://rdflib.net/store/ConjunctiveGraph')))
+    print("Adding %s\n\t%s\n\t%s\n" % (statementId, RDF.predicate, RDFS.label))
+    g0.add((statementId, RDF.predicate, RDFS.label))
+    g1.add((statementId, RDF.predicate, RDFS.label))
+    print("Adding %s\n\t%s\n\t%s\n" % (
+        statementId, RDF.object, Literal("Conjunctive Graph")))
+    g0.add((statementId, RDF.object, Literal("Conjunctive Graph")))
+    print("Len g0 after adding 4 triples %s\n" % len(g0))
+    g1.add((statementId, RDF.object, Literal("Conjunctive Graph")))
+    print("Len g1 after adding 4 triples %s\n" % len(g1))
+    print(g0.serialize(format="nt") + "\n")
+    for s, p, o in g0:
+        print("s = %s\n\tp = %s\n\to = %s\n" % (
+            repr(s), repr(p), repr(o)))
+    print(g1.serialize(format="nt") + "\n")
+    for s, p, o in g1:
+        print("s = %s\n\tp = %s\n\to = %s\n" % (
+            repr(s), repr(p), repr(o)))
+    commands.getoutput('cp development.sqlite devcopy.sqlite')
+    print("Removing %s\n\t%s\n\t%s\n" % (statementId, RDF.type, RDF.Statement))
+    g0.remove((statementId, RDF.type, RDF.Statement))
+    print("Len g0 after removal %s\n" % len(g0))
+    g1.remove((statementId, RDF.type, RDF.Statement))
+    print("Len g1 after removal %s\n" % len(g1))
+    print(g0.serialize(format="nt") + "\n")
+    print(g1.serialize(format="nt") + "\n")
+    g0.close()
+    shutil.rmtree('/tmp/foo')
+    g1.close()
     os.unlink("%(here)s/development.sqlite" % {"here": os.getcwd()})
 
 if __name__ == '__main__':

test/test_sqlalchemy.py

@@ -78,10 +78,10 @@ def test__parse_rfc1738_args(self):
         self.assertRaises(ValueError, _parse_rfc1738_args, 'Not parseable')
 
     def test_namespaces(self):
-        self.assert_(self.graph.namespaces() != [])
+        self.assert_(list(self.graph.namespaces()) != [])
 
     def test_contexts_without_triple(self):
-        self.assert_(self.graph.contexts() != [])
+        self.assert_(list(self.graph.contexts()) == [])
 
     def test_contexts_with_triple(self):
         statemnt = (michel, likes, pizza)