Browse Source

removed selectDB.

Nicolas Cannasse 19 years ago
parent
commit
8e85c2d5fb
4 changed files with 8 additions and 15 deletions
  1. 0 1
      std/neko/db/Connection.hx
  2. 6 7
      std/neko/db/Mysql.hx
  3. 0 4
      std/neko/db/Sqlite.hx
  4. 2 3
      std/neko/db/Transaction.hx

+ 0 - 1
std/neko/db/Connection.hx

@@ -30,7 +30,6 @@ enum Feature {
 
 interface Connection {
 
-	function selectDB( db : String ) : Void;
 	function request( s : String ) : ResultSet;
 	function close() : Void;
 	function escape( s : String ) : String;

+ 6 - 7
std/neko/db/Mysql.hx

@@ -111,10 +111,6 @@ private class MysqlConnection implements Connection {
 		__c = c;
 	}
 
-	public function selectDB( db : String ) {
-		sql_select_db(this.__c,untyped db.__s);
-	}
-
 	public function request( s : String ) : ResultSet {
 		try {
 			var r = sql_request(this.__c,untyped s.__s);
@@ -152,7 +148,6 @@ private class MysqlConnection implements Connection {
 	}
 
 	private static var __use_date = Date;
-	private static var sql_select_db = neko.Lib.load("mysql","select_db",2);
 	private static var sql_request = neko.Lib.load("mysql","request",2);
 	private static var sql_close = neko.Lib.load("mysql","close",1);
 	private static var sql_escape = neko.Lib.load("mysql","escape",2);
@@ -165,7 +160,8 @@ class Mysql {
 		port : Int,
 		user : String,
 		pass : String,
-		socket : String
+		socket : String,
+		database : String
 	} ) : neko.db.Connection {
 		var o = untyped {
 			host : params.host.__s,
@@ -174,9 +170,12 @@ class Mysql {
 			pass : params.pass.__s,
 			socket : if( params.socket == null ) null else params.socket.__s
 		};
-		return new MysqlConnection(sql_connect(o));
+		var c = sql_connect(o);
+		sql_select_db(untyped database.__s);
+		return new MysqlConnection(c);
 	}
 
 	static var sql_connect = neko.Lib.load("mysql","connect",1);
+	private static var sql_select_db = neko.Lib.load("mysql","select_db",2);
 
 }

+ 0 - 4
std/neko/db/Sqlite.hx

@@ -34,10 +34,6 @@ private class SqliteConnection implements Connection {
 		c = _connect(untyped file.__s);
 	}
 
-	public function selectDB( db : String ) {
-		c = _connect(untyped db.__s);
-	}
-
 	public function close() {
 		_close(c);
 	}

+ 2 - 3
std/neko/db/Transaction.hx

@@ -50,10 +50,9 @@ class Transaction {
 		}
 	}
 
-	public static function main( dbparams, dbname, mainFun : Void -> Void, logError : Dynamic -> Void ) {
+	public static function main( cnx, mainFun : Void -> Void, logError : Dynamic -> Void ) {
 		Manager.initialize();
-		Manager.cnx = Mysql.connect(dbparams);
-		Manager.cnx.selectDB(dbname);
+		Manager.cnx = cnx;
 		Manager.cnx.request("START TRANSACTION");
 		runMainLoop(mainFun,logError,3);
 		Manager.cnx.request("COMMIT");