Merge branch 'master' of github.com:CopyIsRight/GoldDigger

Author: Raafas

Pod/SQL/GDGEntity+SQL.m

@@ -297,18 +297,19 @@ - (BOOL)save:(NSError **)error
 		saved = [db.table update:values error:error];
 	}
 	else
-		saved = [db.table insert:values error:error];
-
-	if (saved && !exists && self.id == nil)
-		self.id = [db.table lastInsertedId];
+	{
+		int insertId = [db.table insert:values error:error];
+		self.id = [NSNumber numberWithInt:insertId];
+		saved = self.id != nil ? true : false;
+	}
 
 	for (GDGRelation *relation in relations)
-  {
-    BOOL success = [relation save:self error:error];
-    if (!success || *error) {
-      return NO;
-    }
-  }
+	{
+		BOOL success = [relation save:self error:error];
+		if (!success || error != nil) {
+			return NO;
+		}
+	}
 
 	if (saved)
 		[self.changedProperties removeAllObjects];

Pod/SQL/SQLTableSource.h

@@ -33,7 +33,7 @@
 
 - (CIRStatement *)deleteStatement;
 
-- (BOOL)insert:(NSDictionary <NSString *, id> *)values error:(NSError **)error;
+- (int)insert:(NSDictionary <NSString *, id> *)values error:(NSError **)error;
 
 - (BOOL)update:(NSDictionary <NSString *, id> *)values error:(NSError **)error;
 

Pod/SQL/SQLTableSource.m

@@ -6,6 +6,10 @@
 //
 
 #import <SQLAid/CIRDatabase.h>
+#import <SQLAid/CIRStatement.h>
+
+#import <sqlite3/sqlite3.h> // TODO
+
 #import <ObjectiveSugar/NSArray+ObjectiveSugar.h>
 #import "SQLTableSource.h"
 
@@ -234,15 +238,37 @@ - (CIRStatement *)deleteStatement
 
 #pragma mark Execute
 
-- (BOOL)insert:(NSDictionary <NSString *, id> *)values error:(NSError **)error
+- (int)insert:(NSDictionary <NSString *, id> *)values error:(NSError **)error
 {
+	NSNumber *i;
+	sqlite3 *handler = _databaseProvider.database.handler;
+	int code = 0;
+	const char *errMessage;
+
+	code = sqlite3_exec(handler, [@"DROP TABLE IF EXISTS temp._temp" UTF8String], 0, 0, &errMessage);
+	code = sqlite3_exec(handler, [@"CREATE TEMP TABLE IF NOT EXISTS _temp (id INTEGER NOT NULL PRIMARY KEY)" UTF8String], 0, 0, &errMessage);
+	code = sqlite3_exec(handler, [[NSString stringWithFormat:@"CREATE TEMP TRIGGER _trigger AFTER INSERT ON main.%@ BEGIN INSERT INTO _temp SELECT NEW.id; END", _name, _name] UTF8String], 0, 0, &errMessage);
+
 	NSString *insertString = [self insertStringForColumns:[values allKeys]];
 	BOOL succeeded = [_databaseProvider.database executeUpdate:insertString withNamedParameters:values error:error];
 	if (!succeeded && error)
 		*error = [NSError errorWithDomain:@"com.CopyIsRight.GoldDigger" code:kDEFAULT_ERROR_CODE
-		                         userInfo:@{NSLocalizedDescriptionKey : _databaseProvider.database.lastErrorMessage}];
+								 userInfo:@{NSLocalizedDescriptionKey : _databaseProvider.database.lastErrorMessage}];
 
-	return succeeded;
+	code = sqlite3_exec(handler, [@"DROP TRIGGER _trigger;" UTF8String], 0, 0, &errMessage);
+
+	sqlite3_stmt *stmt;
+	code = sqlite3_prepare_v2(handler, [@"SELECT id FROM temp._temp ORDER BY id DESC" UTF8String], -1, &stmt, 0);
+
+	if (sqlite3_step(stmt) == SQLITE_ROW)
+		i = [NSNumber numberWithInt:sqlite3_column_int(stmt, 0)];
+
+	sqlite3_reset(stmt);
+	sqlite3_finalize(stmt);
+
+	code = sqlite3_exec(handler, [@"DELETE FROM temp._temp" UTF8String], 0, 0, &errMessage);
+
+	return i.intValue;
 }
 
 - (BOOL)update:(NSDictionary <NSString *, id> *)values error:(NSError **)error