use insert ignore for page sets

Daniel Kinzler · Daniel Kinzler · commit 48b58d8e8bb2 · 2011-12-21T14:09:33.000Z
git-svn-id: https://svn.toolserver.org/svnroot/daniel/duesenstuff/trunk/gpClient@553 9f2c43bc-b3c0-43f4-b155-41619b16f219
diff --git a/php/gpMediaWiki.php b/php/gpMediaWiki.php
@@ -306,12 +306,12 @@ public function resolve_ids( ) {
 	}
 
 	public function make_sink() {
-		$sink = $this->glue->make_sink( $this->table_obj );
+		$sink = $this->glue->make_sink( $this->table_obj, true );
 		return $sink;
 	}
 
 	public function make_id_sink() {
-		$sink = $this->glue->make_sink( $this->table_id_obj );
+		$sink = $this->glue->make_sink( $this->table_id_obj, true );
 		return $sink;
 	}
 
diff --git a/php/gpMySQL.php b/php/gpMySQL.php
@@ -176,9 +176,11 @@ abstract class gpMySQLInserter {
 	var $table;
 	var $fields;
 
-	function __construct ( gpMySQLGlue $glue, gpMySQLTable $table ) {
+	function __construct ( gpMySQLGlue $glue, gpMySQLTable $table, $ignore_dupes = false ) {
 		$this->glue = $glue;
 		$this->table = $table;
+		
+		$this->ignore_dupes = $ignore_dupes; #TODO: port $ignore_dupes to python!
 	}
 	
 	public abstract function insert( $values );
@@ -199,7 +201,7 @@ public function as_list( $values ) {
 	}
 	
 	protected function insert_command( ) {
-		return $this->table->get_insert();
+		return $this->table->get_insert( $this->ignore_dupes ); #TODO: port use of $ignore_dupes to python!
 	}
 	
 	public function insert( $values ) {
@@ -214,8 +216,8 @@ public function insert( $values ) {
 
 class gpMySQLBufferedInserter extends gpMySQLSimpleInserter {
 
-	function __construct ( gpMySQLGlue $glue, gpMySQLTable $table ) {
-		parent::__construct( $glue, $table );
+	function __construct ( gpMySQLGlue $glue, gpMySQLTable $table, $ignore_dupes = false ) {
+		parent::__construct( $glue, $table, $ignore_dupes );
 		$this->buffer = "";
 	}
 
@@ -537,21 +539,21 @@ public function select_into( $query, gpDataSink $sink ) {
 		return $c;
 	}
 	
-	protected function new_inserter( gpMySQLTable $table ) {
-		return new gpMySQLBufferedInserter( $this, $table );
+	protected function new_inserter( gpMySQLTable $table, $ignore_dupes = false ) {
+		return new gpMySQLBufferedInserter( $this, $table, $ignore_dupes );
 	}
 	
-	public function make_temp_sink( gpMySQLTable $table ) {
+	public function make_temp_sink( gpMySQLTable $table, $ignore_dupes = false ) {
 		$table = $this->make_temp_table($table);
 		
-		$ins = $this->new_inserter($table);
+		$ins = $this->new_inserter($table, $ignore_dupes);
 		$sink = new gpMySQLTempSink( $ins, $this, $table );
 		
 		return $sink;
 	}
 
-	public function make_sink( gpMySQLTable $table ) {
-		$inserter = $this->new_inserter($table);
+	public function make_sink( gpMySQLTable $table, $ignore_dupes = false ) { #TODO: port $ignore_dupes to python
+		$inserter = $this->new_inserter($table, $ignore_dupes);
 		$sink = new gpMySQLSink( $inserter );
 		
 		return $sink;

Original file line number	Diff line number	Diff line change
`@@ -306,12 +306,12 @@ public function resolve_ids( ) {`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`public function make_sink() {`
`309`		`- $sink = $this->glue->make_sink( $this->table_obj );`
	`309`	`+ $sink = $this->glue->make_sink( $this->table_obj, true );`
`310`	`310`	`return $sink;`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`public function make_id_sink() {`
`314`		`- $sink = $this->glue->make_sink( $this->table_id_obj );`
	`314`	`+ $sink = $this->glue->make_sink( $this->table_id_obj, true );`
`315`	`315`	`return $sink;`
`316`	`316`	`}`
`317`	`317`