diff --git a/ext/phalcon/db/adapter/pdo/mysql.zep.c b/ext/phalcon/db/adapter/pdo/mysql.zep.c index 036aeaa3653..1b3c8284d6f 100644 --- a/ext/phalcon/db/adapter/pdo/mysql.zep.c +++ b/ext/phalcon/db/adapter/pdo/mysql.zep.c @@ -64,9 +64,9 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_Adapter_Pdo_Mysql) { */ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { - zephir_fcall_cache_entry *_39 = NULL; + zephir_fcall_cache_entry *_38 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *table_param = NULL, *schema_param = NULL, __$true, columns, columnType, field, definition, oldColumn, sizePattern, matches, matchOne, matchTwo, columnName, _0, _1, _2, _3, *_4, _5$$4, _6$$5, _7$$5, _8$$6, _9$$6, _10$$7, _11$$8, _12$$9, _13$$10, _14$$11, _15$$12, _16$$13, _17$$13, _18$$14, _19$$14, _20$$15, _21$$15, _22$$16, _23$$16, _24$$17, _25$$17, _26$$18, _27$$19, _28$$20, _29$$21, _30$$22, _31$$24, _32$$25, _33$$3, _34$$3, _35$$3, _36$$3, _38$$3, _37$$32; + zval *table_param = NULL, *schema_param = NULL, __$true, columns, columnType, field, definition, oldColumn, sizePattern, matches, matchOne, matchTwo, columnName, _0, _1, _2, _3, *_4, _5$$4, _6$$5, _7$$5, _8$$6, _9$$6, _10$$7, _11$$8, _12$$9, _13$$10, _14$$11, _15$$12, _16$$13, _17$$13, _18$$14, _19$$14, _20$$15, _21$$15, _22$$16, _23$$16, _24$$17, _25$$18, _26$$19, _27$$20, _28$$21, _29$$22, _30$$24, _31$$25, _32$$3, _33$$3, _34$$3, _35$$3, _37$$3, _36$$32; zval table, schema; zval *this_ptr = getThis(); @@ -107,20 +107,19 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { ZVAL_UNDEF(&_22$$16); ZVAL_UNDEF(&_23$$16); ZVAL_UNDEF(&_24$$17); - ZVAL_UNDEF(&_25$$17); - ZVAL_UNDEF(&_26$$18); - ZVAL_UNDEF(&_27$$19); - ZVAL_UNDEF(&_28$$20); - ZVAL_UNDEF(&_29$$21); - ZVAL_UNDEF(&_30$$22); - ZVAL_UNDEF(&_31$$24); - ZVAL_UNDEF(&_32$$25); + ZVAL_UNDEF(&_25$$18); + ZVAL_UNDEF(&_26$$19); + ZVAL_UNDEF(&_27$$20); + ZVAL_UNDEF(&_28$$21); + ZVAL_UNDEF(&_29$$22); + ZVAL_UNDEF(&_30$$24); + ZVAL_UNDEF(&_31$$25); + ZVAL_UNDEF(&_32$$3); ZVAL_UNDEF(&_33$$3); ZVAL_UNDEF(&_34$$3); ZVAL_UNDEF(&_35$$3); - ZVAL_UNDEF(&_36$$3); - ZVAL_UNDEF(&_38$$3); - ZVAL_UNDEF(&_37$$32); + ZVAL_UNDEF(&_37$$3); + ZVAL_UNDEF(&_36$$32); ZEPHIR_MM_GROW(); zephir_fetch_params(1, 1, 1, &table_param, &schema_param); @@ -146,7 +145,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { ZVAL_LONG(&_3, 3); ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchall", NULL, 0, &_2, &_3); zephir_check_call_status(); - zephir_is_iterable(&_0, 0, "phalcon/db/adapter/pdo/mysql.zep", 265); + zephir_is_iterable(&_0, 0, "phalcon/db/adapter/pdo/mysql.zep", 264); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _4) { ZEPHIR_INIT_NVAR(&field); @@ -235,47 +234,44 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { ZEPHIR_INIT_NVAR(&_24$$17); ZVAL_LONG(&_24$$17, 10); zephir_array_update_string(&definition, SL("type"), &_24$$17, PH_COPY | PH_SEPARATE); - ZEPHIR_INIT_NVAR(&_25$$17); - ZVAL_LONG(&_25$$17, 5); - zephir_array_update_string(&definition, SL("bindType"), &_25$$17, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("mediumblob"), "phalcon/db/adapter/pdo/mysql.zep", 176)) { - ZEPHIR_INIT_NVAR(&_26$$18); - ZVAL_LONG(&_26$$18, 12); - zephir_array_update_string(&definition, SL("type"), &_26$$18, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("longblob"), "phalcon/db/adapter/pdo/mysql.zep", 181)) { - ZEPHIR_INIT_NVAR(&_27$$19); - ZVAL_LONG(&_27$$19, 13); - zephir_array_update_string(&definition, SL("type"), &_27$$19, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("blob"), "phalcon/db/adapter/pdo/mysql.zep", 186)) { - ZEPHIR_INIT_NVAR(&_28$$20); - ZVAL_LONG(&_28$$20, 11); - zephir_array_update_string(&definition, SL("type"), &_28$$20, PH_COPY | PH_SEPARATE); + } else if (zephir_memnstr_str(&columnType, SL("mediumblob"), "phalcon/db/adapter/pdo/mysql.zep", 175)) { + ZEPHIR_INIT_NVAR(&_25$$18); + ZVAL_LONG(&_25$$18, 12); + zephir_array_update_string(&definition, SL("type"), &_25$$18, PH_COPY | PH_SEPARATE); + } else if (zephir_memnstr_str(&columnType, SL("longblob"), "phalcon/db/adapter/pdo/mysql.zep", 180)) { + ZEPHIR_INIT_NVAR(&_26$$19); + ZVAL_LONG(&_26$$19, 13); + zephir_array_update_string(&definition, SL("type"), &_26$$19, PH_COPY | PH_SEPARATE); + } else if (zephir_memnstr_str(&columnType, SL("blob"), "phalcon/db/adapter/pdo/mysql.zep", 185)) { + ZEPHIR_INIT_NVAR(&_27$$20); + ZVAL_LONG(&_27$$20, 11); + zephir_array_update_string(&definition, SL("type"), &_27$$20, PH_COPY | PH_SEPARATE); } else { - ZEPHIR_INIT_NVAR(&_29$$21); - ZVAL_LONG(&_29$$21, 2); - zephir_array_update_string(&definition, SL("type"), &_29$$21, PH_COPY | PH_SEPARATE); + ZEPHIR_INIT_NVAR(&_28$$21); + ZVAL_LONG(&_28$$21, 2); + zephir_array_update_string(&definition, SL("type"), &_28$$21, PH_COPY | PH_SEPARATE); } - if (zephir_memnstr_str(&columnType, SL("("), "phalcon/db/adapter/pdo/mysql.zep", 201)) { + if (zephir_memnstr_str(&columnType, SL("("), "phalcon/db/adapter/pdo/mysql.zep", 200)) { ZEPHIR_INIT_NVAR(&matches); ZVAL_NULL(&matches); - ZEPHIR_INIT_NVAR(&_30$$22); - zephir_preg_match(&_30$$22, &sizePattern, &columnType, &matches, 0, 0 , 0 TSRMLS_CC); - if (zephir_is_true(&_30$$22)) { + ZEPHIR_INIT_NVAR(&_29$$22); + zephir_preg_match(&_29$$22, &sizePattern, &columnType, &matches, 0, 0 , 0 TSRMLS_CC); + if (zephir_is_true(&_29$$22)) { ZEPHIR_OBS_NVAR(&matchOne); if (zephir_array_isset_long_fetch(&matchOne, &matches, 1, 0 TSRMLS_CC)) { - ZEPHIR_INIT_NVAR(&_31$$24); - ZVAL_LONG(&_31$$24, zephir_get_intval(&matchOne)); - zephir_array_update_string(&definition, SL("size"), &_31$$24, PH_COPY | PH_SEPARATE); + ZEPHIR_INIT_NVAR(&_30$$24); + ZVAL_LONG(&_30$$24, zephir_get_intval(&matchOne)); + zephir_array_update_string(&definition, SL("size"), &_30$$24, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_NVAR(&matchTwo); if (zephir_array_isset_long_fetch(&matchTwo, &matches, 2, 0 TSRMLS_CC)) { - ZEPHIR_INIT_NVAR(&_32$$25); - ZVAL_LONG(&_32$$25, zephir_get_intval(&matchTwo)); - zephir_array_update_string(&definition, SL("scale"), &_32$$25, PH_COPY | PH_SEPARATE); + ZEPHIR_INIT_NVAR(&_31$$25); + ZVAL_LONG(&_31$$25, zephir_get_intval(&matchTwo)); + zephir_array_update_string(&definition, SL("scale"), &_31$$25, PH_COPY | PH_SEPARATE); } } } - if (zephir_memnstr_str(&columnType, SL("unsigned"), "phalcon/db/adapter/pdo/mysql.zep", 216)) { + if (zephir_memnstr_str(&columnType, SL("unsigned"), "phalcon/db/adapter/pdo/mysql.zep", 215)) { zephir_array_update_string(&definition, SL("unsigned"), &__$true, PH_COPY | PH_SEPARATE); } if (Z_TYPE_P(&oldColumn) == IS_NULL) { @@ -283,30 +279,30 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { } else { zephir_array_update_string(&definition, SL("after"), &oldColumn, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_33$$3, &field, 3, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 232 TSRMLS_CC); - if (ZEPHIR_IS_STRING(&_33$$3, "PRI")) { + zephir_array_fetch_long(&_32$$3, &field, 3, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 231 TSRMLS_CC); + if (ZEPHIR_IS_STRING(&_32$$3, "PRI")) { zephir_array_update_string(&definition, SL("primary"), &__$true, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_34$$3, &field, 2, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 239 TSRMLS_CC); - if (ZEPHIR_IS_STRING(&_34$$3, "NO")) { + zephir_array_fetch_long(&_33$$3, &field, 2, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 238 TSRMLS_CC); + if (ZEPHIR_IS_STRING(&_33$$3, "NO")) { zephir_array_update_string(&definition, SL("notNull"), &__$true, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_35$$3, &field, 5, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 246 TSRMLS_CC); - if (ZEPHIR_IS_STRING(&_35$$3, "auto_increment")) { + zephir_array_fetch_long(&_34$$3, &field, 5, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 245 TSRMLS_CC); + if (ZEPHIR_IS_STRING(&_34$$3, "auto_increment")) { zephir_array_update_string(&definition, SL("autoIncrement"), &__$true, PH_COPY | PH_SEPARATE); } - ZEPHIR_OBS_NVAR(&_36$$3); - zephir_array_fetch_long(&_36$$3, &field, 4, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 253 TSRMLS_CC); - if (Z_TYPE_P(&_36$$3) != IS_NULL) { - zephir_array_fetch_long(&_37$$32, &field, 4, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 254 TSRMLS_CC); - zephir_array_update_string(&definition, SL("default"), &_37$$32, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(&_35$$3); + zephir_array_fetch_long(&_35$$3, &field, 4, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 252 TSRMLS_CC); + if (Z_TYPE_P(&_35$$3) != IS_NULL) { + zephir_array_fetch_long(&_36$$32, &field, 4, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 253 TSRMLS_CC); + zephir_array_update_string(&definition, SL("default"), &_36$$32, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&columnName, &field, 0, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 260 TSRMLS_CC); - ZEPHIR_INIT_NVAR(&_38$$3); - object_init_ex(&_38$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_38$$3, "__construct", &_39, 154, &columnName, &definition); + zephir_array_fetch_long(&columnName, &field, 0, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 259 TSRMLS_CC); + ZEPHIR_INIT_NVAR(&_37$$3); + object_init_ex(&_37$$3, phalcon_db_column_ce); + ZEPHIR_CALL_METHOD(NULL, &_37$$3, "__construct", &_38, 154, &columnName, &definition); zephir_check_call_status(); - zephir_array_append(&columns, &_38$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 261); + zephir_array_append(&columns, &_37$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 260); ZEPHIR_CPY_WRT(&oldColumn, &columnName); } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&field); @@ -397,31 +393,31 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) { ZVAL_LONG(&_3, 2); ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchall", NULL, 0, &_2, &_3); zephir_check_call_status(); - zephir_is_iterable(&_0, 0, "phalcon/db/adapter/pdo/mysql.zep", 310); + zephir_is_iterable(&_0, 0, "phalcon/db/adapter/pdo/mysql.zep", 309); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _4) { ZEPHIR_INIT_NVAR(&index); ZVAL_COPY(&index, _4); - zephir_array_fetch_string(&keyName, &index, SL("Key_name"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 283 TSRMLS_CC); - zephir_array_fetch_string(&indexType, &index, SL("Index_type"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 284 TSRMLS_CC); + zephir_array_fetch_string(&keyName, &index, SL("Key_name"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 282 TSRMLS_CC); + zephir_array_fetch_string(&indexType, &index, SL("Index_type"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 283 TSRMLS_CC); if (!(zephir_array_isset(&indexes, &keyName))) { ZEPHIR_INIT_NVAR(&_5$$4); array_init(&_5$$4); zephir_array_update_zval(&indexes, &keyName, &_5$$4, PH_COPY | PH_SEPARATE); } - zephir_array_fetch(&_6$$3, &indexes, &keyName, PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 290 TSRMLS_CC); + zephir_array_fetch(&_6$$3, &indexes, &keyName, PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 289 TSRMLS_CC); if (!(zephir_array_isset_string(&_6$$3, SL("columns")))) { ZEPHIR_INIT_NVAR(&columns); array_init(&columns); } else { - zephir_array_fetch(&_7$$6, &indexes, &keyName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 293 TSRMLS_CC); + zephir_array_fetch(&_7$$6, &indexes, &keyName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 292 TSRMLS_CC); ZEPHIR_OBS_NVAR(&columns); - zephir_array_fetch_string(&columns, &_7$$6, SL("columns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 293 TSRMLS_CC); + zephir_array_fetch_string(&columns, &_7$$6, SL("columns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 292 TSRMLS_CC); } - zephir_array_fetch_string(&_8$$3, &index, SL("Column_name"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 296 TSRMLS_CC); - zephir_array_append(&columns, &_8$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 296); + zephir_array_fetch_string(&_8$$3, &index, SL("Column_name"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 295 TSRMLS_CC); + zephir_array_append(&columns, &_8$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 295); zephir_array_update_multi(&indexes, &columns TSRMLS_CC, SL("zs"), 3, &keyName, SL("columns")); - zephir_array_fetch_string(&_9$$3, &index, SL("Non_unique"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 303 TSRMLS_CC); + zephir_array_fetch_string(&_9$$3, &index, SL("Non_unique"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 302 TSRMLS_CC); if (ZEPHIR_IS_STRING(&keyName, "PRIMARY")) { ZEPHIR_INIT_NVAR(&_10$$7); ZVAL_STRING(&_10$$7, "PRIMARY"); @@ -441,7 +437,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) { ZEPHIR_INIT_NVAR(&index); ZEPHIR_INIT_VAR(&indexObjects); array_init(&indexObjects); - zephir_is_iterable(&indexes, 0, "phalcon/db/adapter/pdo/mysql.zep", 315); + zephir_is_iterable(&indexes, 0, "phalcon/db/adapter/pdo/mysql.zep", 314); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&indexes), _14, _15, _13) { ZEPHIR_INIT_NVAR(&name); @@ -454,8 +450,8 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) { ZVAL_COPY(&index, _13); ZEPHIR_INIT_NVAR(&_16$$11); object_init_ex(&_16$$11, phalcon_db_index_ce); - zephir_array_fetch_string(&_17$$11, &index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 312 TSRMLS_CC); - zephir_array_fetch_string(&_18$$11, &index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 312 TSRMLS_CC); + zephir_array_fetch_string(&_17$$11, &index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 311 TSRMLS_CC); + zephir_array_fetch_string(&_18$$11, &index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 311 TSRMLS_CC); ZEPHIR_CALL_METHOD(NULL, &_16$$11, "__construct", &_19, 19, &name, &_17$$11, &_18$$11); zephir_check_call_status(); zephir_array_update_zval(&indexObjects, &name, &_16$$11, PH_COPY | PH_SEPARATE); @@ -555,49 +551,49 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeReferences) { ZVAL_LONG(&_3, 3); ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchall", NULL, 0, &_2, &_3); zephir_check_call_status(); - zephir_is_iterable(&_0, 0, "phalcon/db/adapter/pdo/mysql.zep", 369); + zephir_is_iterable(&_0, 0, "phalcon/db/adapter/pdo/mysql.zep", 368); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _4) { ZEPHIR_INIT_NVAR(&reference); ZVAL_COPY(&reference, _4); - zephir_array_fetch_long(&constraintName, &reference, 2, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 338 TSRMLS_CC); + zephir_array_fetch_long(&constraintName, &reference, 2, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 337 TSRMLS_CC); if (!(zephir_array_isset(&references, &constraintName))) { ZEPHIR_OBS_NVAR(&referencedSchema); - zephir_array_fetch_long(&referencedSchema, &reference, 3, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 340 TSRMLS_CC); + zephir_array_fetch_long(&referencedSchema, &reference, 3, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 339 TSRMLS_CC); ZEPHIR_OBS_NVAR(&referencedTable); - zephir_array_fetch_long(&referencedTable, &reference, 4, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 341 TSRMLS_CC); + zephir_array_fetch_long(&referencedTable, &reference, 4, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 340 TSRMLS_CC); ZEPHIR_OBS_NVAR(&referenceUpdate); - zephir_array_fetch_long(&referenceUpdate, &reference, 6, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 342 TSRMLS_CC); + zephir_array_fetch_long(&referenceUpdate, &reference, 6, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 341 TSRMLS_CC); ZEPHIR_OBS_NVAR(&referenceDelete); - zephir_array_fetch_long(&referenceDelete, &reference, 7, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 343 TSRMLS_CC); + zephir_array_fetch_long(&referenceDelete, &reference, 7, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 342 TSRMLS_CC); ZEPHIR_INIT_NVAR(&columns); array_init(&columns); ZEPHIR_INIT_NVAR(&referencedColumns); array_init(&referencedColumns); } else { - zephir_array_fetch(&_5$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 348 TSRMLS_CC); + zephir_array_fetch(&_5$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 347 TSRMLS_CC); ZEPHIR_OBS_NVAR(&referencedSchema); - zephir_array_fetch_string(&referencedSchema, &_5$$5, SL("referencedSchema"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 348 TSRMLS_CC); - zephir_array_fetch(&_6$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 349 TSRMLS_CC); + zephir_array_fetch_string(&referencedSchema, &_5$$5, SL("referencedSchema"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 347 TSRMLS_CC); + zephir_array_fetch(&_6$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 348 TSRMLS_CC); ZEPHIR_OBS_NVAR(&referencedTable); - zephir_array_fetch_string(&referencedTable, &_6$$5, SL("referencedTable"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 349 TSRMLS_CC); - zephir_array_fetch(&_7$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 350 TSRMLS_CC); + zephir_array_fetch_string(&referencedTable, &_6$$5, SL("referencedTable"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 348 TSRMLS_CC); + zephir_array_fetch(&_7$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 349 TSRMLS_CC); ZEPHIR_OBS_NVAR(&columns); - zephir_array_fetch_string(&columns, &_7$$5, SL("columns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 350 TSRMLS_CC); - zephir_array_fetch(&_8$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 351 TSRMLS_CC); + zephir_array_fetch_string(&columns, &_7$$5, SL("columns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 349 TSRMLS_CC); + zephir_array_fetch(&_8$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 350 TSRMLS_CC); ZEPHIR_OBS_NVAR(&referencedColumns); - zephir_array_fetch_string(&referencedColumns, &_8$$5, SL("referencedColumns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 351 TSRMLS_CC); - zephir_array_fetch(&_9$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 352 TSRMLS_CC); + zephir_array_fetch_string(&referencedColumns, &_8$$5, SL("referencedColumns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 350 TSRMLS_CC); + zephir_array_fetch(&_9$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 351 TSRMLS_CC); ZEPHIR_OBS_NVAR(&referenceUpdate); - zephir_array_fetch_string(&referenceUpdate, &_9$$5, SL("onUpdate"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 352 TSRMLS_CC); - zephir_array_fetch(&_10$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 353 TSRMLS_CC); + zephir_array_fetch_string(&referenceUpdate, &_9$$5, SL("onUpdate"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 351 TSRMLS_CC); + zephir_array_fetch(&_10$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 352 TSRMLS_CC); ZEPHIR_OBS_NVAR(&referenceDelete); - zephir_array_fetch_string(&referenceDelete, &_10$$5, SL("onDelete"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 353 TSRMLS_CC); + zephir_array_fetch_string(&referenceDelete, &_10$$5, SL("onDelete"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 352 TSRMLS_CC); } - zephir_array_fetch_long(&_11$$3, &reference, 1, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 356 TSRMLS_CC); - zephir_array_append(&columns, &_11$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 356); - zephir_array_fetch_long(&_12$$3, &reference, 5, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 357 TSRMLS_CC); - zephir_array_append(&referencedColumns, &_12$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 357); + zephir_array_fetch_long(&_11$$3, &reference, 1, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 355 TSRMLS_CC); + zephir_array_append(&columns, &_11$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 355); + zephir_array_fetch_long(&_12$$3, &reference, 5, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 356 TSRMLS_CC); + zephir_array_append(&referencedColumns, &_12$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 356); ZEPHIR_INIT_NVAR(&_13$$3); zephir_create_array(&_13$$3, 6, 0 TSRMLS_CC); zephir_array_update_string(&_13$$3, SL("referencedSchema"), &referencedSchema, PH_COPY | PH_SEPARATE); @@ -611,7 +607,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeReferences) { ZEPHIR_INIT_NVAR(&reference); ZEPHIR_INIT_VAR(&referenceObjects); array_init(&referenceObjects); - zephir_is_iterable(&references, 0, "phalcon/db/adapter/pdo/mysql.zep", 381); + zephir_is_iterable(&references, 0, "phalcon/db/adapter/pdo/mysql.zep", 380); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&references), _15, _16, _14) { ZEPHIR_INIT_NVAR(&name); @@ -627,22 +623,22 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeReferences) { ZEPHIR_INIT_NVAR(&_18$$6); zephir_create_array(&_18$$6, 6, 0 TSRMLS_CC); ZEPHIR_OBS_NVAR(&_19$$6); - zephir_array_fetch_string(&_19$$6, &arrayReference, SL("referencedSchema"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 372 TSRMLS_CC); + zephir_array_fetch_string(&_19$$6, &arrayReference, SL("referencedSchema"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 371 TSRMLS_CC); zephir_array_update_string(&_18$$6, SL("referencedSchema"), &_19$$6, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_19$$6); - zephir_array_fetch_string(&_19$$6, &arrayReference, SL("referencedTable"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 373 TSRMLS_CC); + zephir_array_fetch_string(&_19$$6, &arrayReference, SL("referencedTable"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 372 TSRMLS_CC); zephir_array_update_string(&_18$$6, SL("referencedTable"), &_19$$6, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_19$$6); - zephir_array_fetch_string(&_19$$6, &arrayReference, SL("columns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 374 TSRMLS_CC); + zephir_array_fetch_string(&_19$$6, &arrayReference, SL("columns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 373 TSRMLS_CC); zephir_array_update_string(&_18$$6, SL("columns"), &_19$$6, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_19$$6); - zephir_array_fetch_string(&_19$$6, &arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 375 TSRMLS_CC); + zephir_array_fetch_string(&_19$$6, &arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 374 TSRMLS_CC); zephir_array_update_string(&_18$$6, SL("referencedColumns"), &_19$$6, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_19$$6); - zephir_array_fetch_string(&_19$$6, &arrayReference, SL("onUpdate"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 376 TSRMLS_CC); + zephir_array_fetch_string(&_19$$6, &arrayReference, SL("onUpdate"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 375 TSRMLS_CC); zephir_array_update_string(&_18$$6, SL("onUpdate"), &_19$$6, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_19$$6); - zephir_array_fetch_string(&_19$$6, &arrayReference, SL("onDelete"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 378 TSRMLS_CC); + zephir_array_fetch_string(&_19$$6, &arrayReference, SL("onDelete"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 377 TSRMLS_CC); zephir_array_update_string(&_18$$6, SL("onDelete"), &_19$$6, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &_17$$6, "__construct", &_20, 20, &name, &_18$$6); zephir_check_call_status(); @@ -707,7 +703,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, addForeignKey) { ZEPHIR_CALL_METHOD(&_2, &foreignKeyCheck, "execute", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_2))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_application_exception_ce, "DATABASE PARAMETER 'FOREIGN_KEY_CHECKS' HAS TO BE 1", "phalcon/db/adapter/pdo/mysql.zep", 393); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_application_exception_ce, "DATABASE PARAMETER 'FOREIGN_KEY_CHECKS' HAS TO BE 1", "phalcon/db/adapter/pdo/mysql.zep", 392); return; } zephir_read_property(&_3, this_ptr, SL("_dialect"), PH_NOISY_CC | PH_READONLY); diff --git a/ext/phalcon/validation/validator/numericality.zep.c b/ext/phalcon/validation/validator/numericality.zep.c index f69e019ea26..5d9570c9b5b 100644 --- a/ext/phalcon/validation/validator/numericality.zep.c +++ b/ext/phalcon/validation/validator/numericality.zep.c @@ -70,9 +70,10 @@ ZEPHIR_INIT_CLASS(Phalcon_Validation_Validator_Numericality) { */ PHP_METHOD(Phalcon_Validation_Validator_Numericality, validate) { + zend_bool _3; zend_long ZEPHIR_LAST_CALL_STATUS; zval field; - zval *validation, validation_sub, *field_param = NULL, value, message, label, replacePairs, code, _0, _1, _2, _3$$3, _4$$3, _5$$3; + zval *validation, validation_sub, *field_param = NULL, value, message, label, replacePairs, code, _0, _1, _2, _4$$3, _5$$3, _6$$3; zval *this_ptr = getThis(); ZVAL_UNDEF(&validation_sub); @@ -84,9 +85,9 @@ PHP_METHOD(Phalcon_Validation_Validator_Numericality, validate) { ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3$$3); ZVAL_UNDEF(&_4$$3); ZVAL_UNDEF(&_5$$3); + ZVAL_UNDEF(&_6$$3); ZVAL_UNDEF(&field); ZEPHIR_MM_GROW(); @@ -109,29 +110,33 @@ PHP_METHOD(Phalcon_Validation_Validator_Numericality, validate) { ZEPHIR_INIT_VAR(&_0); ZEPHIR_INIT_VAR(&_1); ZEPHIR_INIT_VAR(&_2); - ZVAL_STRING(&_2, "/^-?\\d+\\.?\\d*$/"); + ZVAL_STRING(&_2, "/^-?\\d+(?:[\\.,]\\d+)?$/"); zephir_preg_match(&_1, &_2, &value, &_0, 0, 0 , 0 TSRMLS_CC); - if (!(zephir_is_true(&_1))) { + _3 = !zephir_is_true(&_1); + if (!(_3)) { + _3 = !(zephir_is_numeric(&value)); + } + if (_3) { ZEPHIR_CALL_METHOD(&label, this_ptr, "preparelabel", NULL, 0, validation, &field); zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_3$$3); - ZVAL_STRING(&_3$$3, "Numericality"); - ZEPHIR_CALL_METHOD(&message, this_ptr, "preparemessage", NULL, 0, validation, &field, &_3$$3); + ZEPHIR_INIT_VAR(&_4$$3); + ZVAL_STRING(&_4$$3, "Numericality"); + ZEPHIR_CALL_METHOD(&message, this_ptr, "preparemessage", NULL, 0, validation, &field, &_4$$3); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&code, this_ptr, "preparecode", NULL, 0, &field); zephir_check_call_status(); ZEPHIR_INIT_VAR(&replacePairs); zephir_create_array(&replacePairs, 1, 0 TSRMLS_CC); zephir_array_update_string(&replacePairs, SL(":field"), &label, PH_COPY | PH_SEPARATE); - ZEPHIR_INIT_NVAR(&_3$$3); - object_init_ex(&_3$$3, phalcon_validation_message_ce); - ZEPHIR_CALL_FUNCTION(&_4$$3, "strtr", NULL, 22, &message, &replacePairs); + ZEPHIR_INIT_NVAR(&_4$$3); + object_init_ex(&_4$$3, phalcon_validation_message_ce); + ZEPHIR_CALL_FUNCTION(&_5$$3, "strtr", NULL, 22, &message, &replacePairs); zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_5$$3); - ZVAL_STRING(&_5$$3, "Numericality"); - ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 436, &_4$$3, &field, &_5$$3, &code); + ZEPHIR_INIT_VAR(&_6$$3); + ZVAL_STRING(&_6$$3, "Numericality"); + ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 436, &_5$$3, &field, &_6$$3, &code); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, &_4$$3); zephir_check_call_status(); RETURN_MM_BOOL(0); }