Merge pull request #167 from AKSW/feature/fixInitialCommit

Fix initial commit

Author: splattater

quit/core.py

@@ -355,7 +355,7 @@ def changeset(self, commit):
     def getFilesForCommit(self, commit):
         """Get all entry, oid tupples for a commit.
 
-        On Cache miss this method also updates teh commits cache.
+        On Cache miss this method also updates the commits cache.
         """
         uriFileMap = self.config.getgraphurifilemap()
 
@@ -394,11 +394,11 @@ def getFileReferenceAndContext(self, blob, commit):
             return quitWorkingData
         return self._blobs.get(blob)
 
-    def commit(self, graph, delta, message, commit_id, ref, query=None, default_graph=[],
+    def commit(self, graph, delta, message, parent_commit_ref, ref, query=None, default_graph=[],
                named_graph=[], **kwargs):
         """Commit changes after applying deltas to the blobs.
 
-        This methods analyzes the delta an apllies the changes to the blobs of the repository.
+        This methods analyzes the delta and applies the changes to the blobs of the repository.
         A commit message is built with help of message and if called from endpoint with query,
         default_graph and named_graph. **kwargs can be used to extend the commit message with
         custom key-value-pairs.
@@ -407,7 +407,7 @@ def commit(self, graph, delta, message, commit_id, ref, query=None, default_grap
             graph: the current graph instance
             delta: delta that will be applied
             message: commit message
-            commit_id: the commit-id of preceeding commit
+            parent_commit_ref: the commit-id of preceeding commit
             ref: a ref/branch were the commit will be applied to
             query: the query that lead to the commit
             default_graph: using-graph-uri values from SPARQL protocol
@@ -445,19 +445,25 @@ def _apply(f, changeset, identifier):
         if not delta:
             return
 
-        commit = self.repository.revision(commit_id)
-        index = self.repository.index(commit.id)
-
+        parent_commit_id = None
+        parent_commit = None
+        blobs = []
         blobs_new = set()
-        try:
-            blobs = self.getFilesForCommit(commit)
-        except KeyError:
-            blobs = []
+
+        if parent_commit_ref:
+            parent_commit = self.repository.revision(parent_commit_ref)
+        if parent_commit:
+            parent_commit_id = parent_commit.id
+            try:
+                blobs = self.getFilesForCommit(parent_commit)
+            except KeyError:
+                pass
+        index = self.repository.index(parent_commit_id)
 
         for blob in blobs:
             (fileName, oid) = blob
             try:
-                file_reference, contexts = self.getFileReferenceAndContext(blob, commit)
+                file_reference, contexts = self.getFileReferenceAndContext(blob, parent_commit)
                 for context in contexts:
                     for entry in delta:
                         changeset = entry.get(context.identifier, None)

tests/test_app.py

@@ -10,6 +10,7 @@
 from helpers import TemporaryRepository, TemporaryRepositoryFactory
 import json
 from helpers import createCommit, assertResultBindingsEqual
+from tempfile import TemporaryDirectory
 
 
 class SparqlProtocolTests(unittest.TestCase):
@@ -1668,6 +1669,40 @@ def testInitAndSelectFromNonEmptyGraphGet(self):
                 "p": {'type': 'uri', 'value': 'http://ex.org/y'},
                 "o": {'type': 'uri', 'value': 'http://ex.org/z'}})
 
+    def testInsertDataIntoEmptyRepository(self):
+        """Test inserting data and selecting it, starting with an empty directory.
+
+        1. Prepare an empty directory
+        2. Start Quit
+        3. execute INSERT DATA query
+        4. execute SELECT query
+        """
+        # Prepate a git Repository
+        with TemporaryDirectory() as repo:
+
+            # Start Quit
+            args = quitApp.parseArgs(['-t', repo, '-cm', 'graphfiles'])
+            objects = quitApp.initialize(args)
+            config = objects['config']
+            app = create_app(config).test_client()
+
+            # execute INSERT DATA query
+            update = "INSERT DATA {graph <http://example.org/> {<http://ex.org/a> <http://ex.org/b> <http://ex.org/c> .}}"
+            app.post('/sparql', data=dict(update=update))
+
+            # execute SELECT query
+            select = "SELECT * WHERE {graph <http://example.org/> {?s ?p ?o .}} ORDER BY ?s ?p ?o"
+            select_resp = app.post('/sparql', data=dict(query=select), headers=dict(accept="application/sparql-results+json"))
+
+            obj = json.loads(select_resp.data.decode("utf-8"))
+
+            self.assertEqual(len(obj["results"]["bindings"]), 1)
+
+            self.assertDictEqual(obj["results"]["bindings"][0], {
+                "s": {'type': 'uri', 'value': 'http://ex.org/a'},
+                "p": {'type': 'uri', 'value': 'http://ex.org/b'},
+                "o": {'type': 'uri', 'value': 'http://ex.org/c'}})
+
     def testInsertDataAndSelectFromEmptyGraph(self):
         """Test inserting data and selecting it, starting with an empty graph.