Tweaked names so column is called COL_ID and not COL__ID

spacecowboy · spacecowboy · commit 4fd840ffbeee · 2013-10-17T12:52:30.000+02:00
Signed-off-by: Jonas Kalderstam &lt;jonas@kalderstam.se&gt;
diff --git a/AndroidCodeGenerator/dbitem.py b/AndroidCodeGenerator/dbitem.py
@@ -97,15 +97,19 @@ def __init__(self, sql_column):
 
     @property
     def declare_const(self):
-        return COL_CONST_TEMPLATE.format(self.column)
+        return COL_CONST_TEMPLATE.format(self.const_name,
+                                         self.var_name)
 
     @property
     def var_name(self):
         return self.column.name
 
     @property
     def const_name(self):
-        return "COL_" + self.column.upper_name
+        name = self.column.upper_name
+        while name.startswith("_"):
+            name = name[1:]
+        return "COL_" + name
 
     @property
     def java_type(self):
@@ -157,7 +161,7 @@ def declare_var(self):
         return "public {0.java_type} {0.var_name} {0.default_value}"\
                .format(self).strip() + ";"
 
-COL_CONST_TEMPLATE = 'public static final String COL_{0.upper_name} = "{0.name}";'
+COL_CONST_TEMPLATE = 'public static final String {0} = "{1}";'
 
 CLASS_TEMPLATE = '''package {pkg};
 
diff --git a/AndroidCodeGenerator/generator.py b/AndroidCodeGenerator/generator.py
@@ -2,7 +2,7 @@
 Will print to the terminal what is needed to
 be added to the Manifest.
 
->>> g = Generator()
+>>> g = Generator(srcdir="./src", pkg="com.ex.app.db")
 """
 
 import os, errno
