Nicolas Cannasse 18 years ago
parent
commit
73c3a6fb6d
2 changed files with 13 additions and 7 deletions
  1. 6 6
      std/neko/db/Manager.hx
  2. 7 1
      std/neko/db/Object.hx

+ 6 - 6
std/neko/db/Manager.hx

@@ -70,7 +70,7 @@ class Manager<T : Object> {
 
 
 		// get the proto fields not marked private (excluding methods)
 		// get the proto fields not marked private (excluding methods)
 		table_fields = new List();
 		table_fields = new List();
-		var proto : Dynamic = class_proto.prototype;
+		var proto : { local_manager : neko.db.Manager<T> } = class_proto.prototype;
 		for( f in Reflect.fields(proto) ) {
 		for( f in Reflect.fields(proto) ) {
 			var isfield = !Reflect.isFunction(Reflect.field(proto,f));
 			var isfield = !Reflect.isFunction(Reflect.field(proto,f));
 			if( isfield )
 			if( isfield )
@@ -198,7 +198,7 @@ class Manager<T : Object> {
 
 
 	/* -------------------------- SPODOBJECT API -------------------------- */
 	/* -------------------------- SPODOBJECT API -------------------------- */
 
 
-	public function doInsert( x : T ) {
+	function doInsert( x : T ) {
 		unmake(x);
 		unmake(x);
 		var s = new StringBuf();
 		var s = new StringBuf();
 		var fields = new List();
 		var fields = new List();
@@ -231,7 +231,7 @@ class Manager<T : Object> {
 		addToCache(x);
 		addToCache(x);
 	}
 	}
 
 
-	public function doUpdate( x : T ) {
+	function doUpdate( x : T ) {
 		unmake(x);
 		unmake(x);
 		var s = new StringBuf();
 		var s = new StringBuf();
 		s.add("UPDATE ");
 		s.add("UPDATE ");
@@ -260,7 +260,7 @@ class Manager<T : Object> {
 		execute(s.toString());
 		execute(s.toString());
 	}
 	}
 
 
-	public function doDelete( x : T ) {
+	function doDelete( x : T ) {
 		var s = new StringBuf();
 		var s = new StringBuf();
 		s.add("DELETE FROM ");
 		s.add("DELETE FROM ");
 		s.add(table_name);
 		s.add(table_name);
@@ -270,7 +270,7 @@ class Manager<T : Object> {
 	}
 	}
 
 
 
 
-	public function doSync( i : T ) {
+	function doSync( i : T ) {
 		object_cache.remove(makeCacheKey(i));
 		object_cache.remove(makeCacheKey(i));
 		var i2 = getWithKeys(i,(cast i).update != no_update);
 		var i2 = getWithKeys(i,(cast i).update != no_update);
 		// delete all fields
 		// delete all fields
@@ -284,7 +284,7 @@ class Manager<T : Object> {
 		addToCache(i);
 		addToCache(i);
 	}
 	}
 
 
-	public function objectToString( it : T ) : String {
+	function objectToString( it : T ) : String {
 		var s = new StringBuf();
 		var s = new StringBuf();
 		s.add(table_name);
 		s.add(table_name);
 		if( table_keys.length == 1 ) {
 		if( table_keys.length == 1 ) {

+ 7 - 1
std/neko/db/Object.hx

@@ -42,7 +42,13 @@ class Object #if spod_rtti implements haxe.rtti.Infos #end {
 	static var manager = new neko.db.Manager();
 	static var manager = new neko.db.Manager();
 */
 */
 
 
-	var local_manager : neko.db.Manager<neko.db.Object>;
+	var local_manager : {
+		private function doUpdate( o : Object ) : Void;
+		private function doInsert( o : Object ) : Void;
+		private function doSync( o : Object ) : Void;
+		private function doDelete( o : Object ) : Void;
+		private function objectToString( o : Object ) : String;
+	};
 
 
 
 
 	public function new() {
 	public function new() {