Maps generation fixed for sqlite.

fix #956
This commit is contained in:
Antoine Nguyen
2016-11-24 14:20:07 +01:00
parent 6838e53ead
commit c6018f71d9
2 changed files with 14 additions and 7 deletions
+7 -3
View File
@@ -42,9 +42,13 @@ class MapFilesTestCase(MapFilesTestCaseMixin, TestCase):
dbsettings = settings.DATABASES["default"]
for f in self.MAP_FILES:
mapcontent = parse_map_file(os.path.join(self.workdir, f))
self.assertEqual(mapcontent["user"], dbsettings["USER"])
self.assertEqual(mapcontent["password"], dbsettings["PASSWORD"])
self.assertEqual(mapcontent["dbname"], dbsettings["NAME"])
if dbsettings["ENGINE"] == "django.db.backends.sqlite3":
self.assertEqual(mapcontent["dbpath"], dbsettings["NAME"])
else:
self.assertEqual(mapcontent["user"], dbsettings["USER"])
self.assertEqual(
mapcontent["password"], dbsettings["PASSWORD"])
self.assertEqual(mapcontent["dbname"], dbsettings["NAME"])
# Now modify a file manually
path = os.path.join(self.workdir, "sql-domains.cf")
@@ -125,10 +125,13 @@ query = {{ query|safe }}
mapcontent = utils.parse_map_file(fullpath)
context = copy.deepcopy(context)
context["dbtype"] = self.__checksums[mapobject.filename]["dbtype"]
context["dbuser"] = mapcontent["user"]
context["dbpass"] = mapcontent["password"]
context["dbname"] = mapcontent["dbname"]
context["dbhost"] = mapcontent["hosts"]
if context["dbtype"] == "sqlite":
context["dbname"] = mapcontent["dbpath"]
else:
context["dbuser"] = mapcontent["user"]
context["dbpass"] = mapcontent["password"]
context["dbname"] = mapcontent["dbname"]
context["dbhost"] = mapcontent["hosts"]
content = self.get_template(context["dbtype"]).render(
Context(
dict(context.items(),