Fix sql javastring order

spacecowboy · spacecowboy · commit 1f4a9dfce8c9 · 2013-09-18T11:46:23.000+02:00
Signed-off-by: Jonas Kalderstam &lt;jonas@kalderstam.se&gt;
diff --git a/AndroidCodeGenerator/database_triggers.py b/AndroidCodeGenerator/database_triggers.py
@@ -36,17 +36,17 @@ class DatabaseTriggers(object):
         }
     <BLANKLINE>
         private static final String tr_archive =
-    "CREATE TEMP TRIGGER IF NOT EXISTS tr_archive
-      BEFORE DELETE ON notes
-      BEGIN
-        INSERT INTO archive (noteid,notetext) VALUES (old._id,old.text);
-      END";
+    "CREATE TEMP TRIGGER IF NOT EXISTS tr_archive"
+    +"  BEFORE DELETE ON notes"
+    +"  BEGIN"
+    +"    INSERT INTO archive (noteid,notetext) VALUES (old._id,old.text);"
+    +"  END";
         private static final String tr_log =
-    "CREATE  TRIGGER IF NOT EXISTS tr_log
-      BEFORE UPDATE  ON notes
-      BEGIN
-        INSERT INTO log (noteid,notetext) VALUES (new._id,new.text);
-      END";
+    "CREATE  TRIGGER IF NOT EXISTS tr_log"
+    +"  BEFORE UPDATE  ON notes"
+    +"  BEGIN"
+    +"    INSERT INTO log (noteid,notetext) VALUES (new._id,new.text);"
+    +"  END";
     }
 
     """
@@ -93,7 +93,7 @@ def def_triggers(self):
 
 _D_T = '''
     private static final String {0.name} =
-"{0}";'''
+"{0.java_string}";'''
 
 _C_P = '''
         db.execSQL("DROP TRIGGER IF EXISTS {0.name}";
diff --git a/AndroidCodeGenerator/db_table.py b/AndroidCodeGenerator/db_table.py
@@ -307,11 +307,12 @@ def __init__(self, name):
         self._when = None
         self._body = []
 
-    def __repr__(self):
-        sql = self.sql_trigger()
+    @property
+    def java_string(self):
+        sql = str(self)
         return '"\n+"'.join(sql.split('\n'))
 
-    def sql_trigger(self):
+    def __repr__(self):
         if self._when is None:
             raise ValueError('You must specify a trigger time, like:\
             Trigger("bob").after, .before or .instead_of')
