Merge pull request #5 from editorsnotes/master

SQL backends not storing literals properly.

Author: gjhiggins

rdflib_sqlalchemy/SQLAlchemy.py

@@ -326,9 +326,13 @@ def py2executeSQL(self, cursor, qStr, params=None, paramList=False):
         elif paramList:
             raise Exception("Not supported!")
         else:
-            params = tuple([
-                not isinstance(item, int) and u"'%s'" % item or item
-                for item in params])
+            def py_to_sql(param):
+                if param is None:
+                    return 'NULL'
+                if isinstance(param, int):
+                    return param
+                return "'%s'" % param
+            params = tuple(map(py_to_sql, params))
             querystr = qStr.replace('"', "'")
             cursor.execute(querystr % params)
 
@@ -348,11 +352,16 @@ def pycompat_executeSQL(self, cursor, qStr, params=None, paramList=False):
         except:
             pass
 
-        def locproc(item):
+        def py_to_sql(param):
+            if param is None:
+                return 'NULL'
+            if isinstance(param, int):
+                return param
             try:
-                return "'%s'" % item.decode()
+                return "'%s'" % param.decode()
             except:
-                return item
+                return param
+
         # _logger.debug("SQLGenerator %s - %s" % (qStr,params))
         if not params:
             querystr = qStr.replace('"', "'")
@@ -365,7 +374,7 @@ def locproc(item):
         elif paramList:
             raise Exception("Not supported!")
         else:
-            params = tuple([locproc(item) for item in params])
+            params = tuple(map(py_to_sql, params))
             querystr = qStr.replace('"', "'")
             querystr = querystr % params
             # if isinstance(qStr, bytes): qStr = qStr.decode()
@@ -461,8 +470,8 @@ def buildLiteralTripleSQLCommand(
             self.normalizeTerm(obj),
             self.normalizeTerm(context.identifier),
             triplePattern,
-            isinstance(obj, Literal) and obj.language or 'NULL',
-            isinstance(obj, Literal) and obj.datatype or 'NULL']
+            isinstance(obj, Literal) and obj.language or None,
+            isinstance(obj, Literal) and obj.datatype or None]
 
     def buildTripleSQLCommand(
             self, subject, predicate, obj, context, storeId, quoted):
@@ -484,8 +493,8 @@ def buildTripleSQLCommand(
                 self.normalizeTerm(obj),
                 self.normalizeTerm(context.identifier),
                 triplePattern,
-                isinstance(obj, Literal) and obj.language or 'NULL',
-                isinstance(obj, Literal) and obj.datatype or 'NULL']
+                isinstance(obj, Literal) and obj.language or None,
+                isinstance(obj, Literal) and obj.datatype or None]
         else:
             command = "INSERT INTO %s " % stmt_table + \
                       "(subject,predicate,object,context,termComb) " + \

test/graph_case.py

@@ -1,7 +1,10 @@
+# -*- coding: utf-8 -*-
+
 import unittest
 from rdflib import Graph
 from rdflib import RDF
 from rdflib import URIRef
+from rdflib import Literal
 from rdflib import plugin
 from rdflib.store import Store
 
@@ -268,6 +271,29 @@ def testGraphIntersection(self):
 
         self.assertEquals((michel, likes, cheese) in g1, True)
 
+    def testStoreLiterals(self):
+        bob = self.bob
+        says = URIRef(u'says')
+        hello = Literal(u'hello', lang='en')
+        konichiwa = Literal(u'こんにちは', lang='ja')
+        something = Literal(u'something')
+
+        self.graph.add((bob, says, hello))
+        self.graph.add((bob, says, konichiwa))
+        self.graph.add((bob, says, something))
+        self.graph.commit()
+
+        objs = list(self.graph.objects(subject=bob, predicate=says))
+        for o in objs:
+            if o.value == u'hello':
+                self.assertEquals(o.language, 'en')
+            elif o.value == u'こんにちは':
+                self.assertEquals(o.language, 'ja')
+            elif o.value == u'something':
+                self.assertEquals(o.language, None)
+            else:
+                self.fail()
+        self.assertEquals(len(list(objs)), 3)
 
 xmltestdoc = """<?xml version="1.0" encoding="UTF-8"?>
 <rdf:RDF

test/test_sqlalchemy_sqlite.py

@@ -9,7 +9,7 @@
 import graph_case
 from rdflib import Literal
 
-sqlalchemy_url = Literal("sqlite://")
+sqlalchemy_url = Literal(os.environ.get('DBURI',"sqlite://"))
 
 
 class SQLASQLiteGraphTestCase(graph_case.GraphTestCase):