fixed queries and saving

iorm/Fields.io

@@ -6,11 +6,21 @@ Field := Object clone do(
     name ::= nil
     value := nil
     table ::= nil
+    flags ::= nil
+
+    init := method(
+        setFlags(list())
+        resend
+    )
 
     getNameAsSQL := method(
         # The name is not quoted. TODO: Fine?
         name
     )
+
+    getFlagsAsSQL := method(
+        flags join(" ")
+    )
 
     quote := method(value,
         table session quote(value)
@@ -26,6 +36,17 @@ Field := Object clone do(
             Iorm InvalidValueError raise("#{ new_value } is not a #{ ioProto type }" interpolate)
         )
     )
+
+    addFlag := method(flag,
+        flags append(flag)
+    )
+
+    newFlagSetter := method(sql,
+        # well, that's an ugly macro. can it be done nicer?
+        doString("""method(is, if(is, flags appendIfAbsent("#{ sql }"), flags remove("#{ sql }")); self)""" interpolate)
+    )
+
+    setIsPrimaryKey := newFlagSetter("PRIMARY KEY")
 )
 
 IntegerField := Field clone do(
@@ -41,7 +62,7 @@ IntegerField := Field clone do(
     )
 
     getCreateQuery := method(
-        """#{ quote(name) } #{ quote(typeName) }""" interpolate // TODO: `NOT NULL ...`
+        """#{ quote(name) } #{ typeName } #{ getFlagsAsSQL }""" interpolate
     )
 )
 
@@ -59,6 +80,6 @@ VarcharField := Field clone do(
     )
 
     getCreateQuery := method(
-        """#{ quote(name) } #{ quote(typeName) }(#{ length })""" interpolate // TODO: `NOT NULL ...`
+        """#{ quote(name) } #{ typeName }(#{ length }) #{ getFlagsAsSQL }""" interpolate
     )
 )

iorm/Query.io

@@ -34,7 +34,7 @@ CreateTable := Object clone do(
         table fields foreach(field,
             queries append(field getCreateQuery)
         )
-        return("""CREATE TABLE #{ table getNameAsSQL } ( #{ queries join(", \n") } );""" interpolate)
+        return("""CREATE TABLE #{ table getNameAsSQL } ( #{ queries join(", ") } );""" interpolate)
     )
 )
 
@@ -49,8 +49,8 @@ InsertInto := Object clone do(
             columns append(field getNameAsSQL)
             values append(field getValueAsSQL)
         )
-        return(("""INSERT INTO #{ table getNameAsSQL } (#{ columns join(",") }) """ ..
-        """VALUES (#{ values join(",") });""") interpolate)
+        return(("""INSERT INTO #{ table getNameAsSQL } (#{ columns join(", ") }) """ ..
+        """VALUES (#{ values join(", ") });""") interpolate)
     )
 )
 

iorm/Session.io

@@ -23,6 +23,7 @@ Session := Object clone do(
     commit := method(
         /* process all statements in `queue`. Return self. */
         queue foreach(stmt,
+            stmt getAsSQL println
             self connection execute(stmt getAsSQL)
         )
         queue = list() # TODO: something like `clear`?
@@ -31,6 +32,7 @@ Session := Object clone do(
 
     execute := method(query,
         commit
+        query getAsSQL println
         executeRaw(query getAsSQL)
     )
 

test.io

@@ -4,7 +4,7 @@ session := Iorm Session withSQLite("./test.sqlite")
 
 Foo := Iorm Model clone do(
     setTableName("Foo")
-    newField("integer", Iorm IntegerField clone)
+    newField("integer", Iorm IntegerField clone setIsPrimaryKey(true))
     newField("string", Iorm VarcharField clone setLength(50))
     setPrimaryKey("integer")
 ) setSession(session)