Merge pull request #1028 from dreamsxin/bug_1022_1.3.0

Fix BUG #1022 1.3.0
phalcon · Aug 8, 2013 · 9a688b3 · 9a688b3
2 parents 98c6e0c + 4e54cac
commit 9a688b3
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/ext/mvc/model.c b/ext/mvc/model.c
@@ -3094,7 +3094,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert){
 	zval *attribute_field = NULL, *exception_message = NULL;
 	zval *value = NULL, *bind_type = NULL, *default_value, *use_explicit_identity;
 	zval *success, *sequence_name = NULL, *support_sequences;
-	zval *source, *last_insert_id;
+	zval *schema, *source, *last_insert_id;
 	HashTable *ah0;
 	HashPosition hp0;
 	zval **hd;
@@ -3294,11 +3294,19 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert){
 			if (phalcon_method_exists_ex(this_ptr, SS("getsequencename") TSRMLS_CC) == SUCCESS) {
 				phalcon_call_method(sequence_name, this_ptr, "getsequencename");
 			} else {
+				PHALCON_INIT_VAR(schema); 
+				phalcon_call_method(schema, this_ptr, "getschema"); 
+
 				PHALCON_INIT_VAR(source);
 				phalcon_call_method(source, this_ptr, "getsource");
-
-				PHALCON_INIT_NVAR(sequence_name);
-				PHALCON_CONCAT_VSVS(sequence_name, source, "_", identity_field, "_seq");
+
+				if (PHALCON_IS_EMPTY(schema)) {	
+					PHALCON_INIT_NVAR(sequence_name);
+					PHALCON_CONCAT_VSVS(sequence_name, source, "_", identity_field, "_seq");
+				} else {
+					PHALCON_INIT_NVAR(sequence_name);
+					PHALCON_CONCAT_VSVSVS(sequence_name, schema, ".", source, "_", identity_field, "_seq");
+				}
 			}
 		}