Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug fixes + build script fixes #1967

Merged
merged 7 commits into from Feb 4, 2014
Merged

Bug fixes + build script fixes #1967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5e84db1
Fix compiler warnings
sjinks Feb 3, 2014
fcafce4
Updated build generator
sjinks Feb 3, 2014
493fed5
Bug fixes
sjinks Feb 3, 2014
3ab9091
Regenerated build/
sjinks Feb 3, 2014
97768da
Updated tests
sjinks Feb 4, 2014
6d19a9b
Fix #1969
sjinks Feb 4, 2014
d4abc3d
Regenerated build/
sjinks Feb 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,942 changes: 1,861 additions & 1,081 deletions build/32bits/phalcon.c
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 30 additions & 4 deletions build/32bits/phalcon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,8 @@ PHALCON_INIT_CLASS(Phalcon_Annotations_Exception);
#ifndef PHALCON_ANNOTATIONS_READER_H
#define PHALCON_ANNOTATIONS_READER_H

#include "php_phalcon.h"

zend_class_entry *phalcon_annotations_reader_ce;

PHALCON_INIT_CLASS(Phalcon_Annotations_Reader);
Expand Down Expand Up @@ -4350,6 +4352,22 @@ zend_class_entry *phalcon_mvc_model_metadata_ce;

PHALCON_INIT_CLASS(Phalcon_Mvc_Model_MetaData);

#define PHALCON_MVC_MODEL_METADATA_MODELS_ATTRIBUTES 0
#define PHALCON_MVC_MODEL_METADATA_MODELS_PRIMARY_KEY 1
#define PHALCON_MVC_MODEL_METADATA_MODELS_NON_PRIMARY_KEY 2
#define PHALCON_MVC_MODEL_METADATA_MODELS_NOT_NULL 3
#define PHALCON_MVC_MODEL_METADATA_MODELS_DATA_TYPES 4
#define PHALCON_MVC_MODEL_METADATA_MODELS_DATA_TYPES_NUMERIC 5
#define PHALCON_MVC_MODEL_METADATA_MODELS_DATE_AT 6
#define PHALCON_MVC_MODEL_METADATA_MODELS_DATE_IN 7
#define PHALCON_MVC_MODEL_METADATA_MODELS_IDENTITY_COLUMN 8
#define PHALCON_MVC_MODEL_METADATA_MODELS_DATA_TYPES_BIND 9
#define PHALCON_MVC_MODEL_METADATA_MODELS_AUTOMATIC_DEFAULT_INSERT 10
#define PHALCON_MVC_MODEL_METADATA_MODELS_AUTOMATIC_DEFAULT_UPDATE 11

#define PHALCON_MVC_MODEL_METADATA_MODELS_COLUMN_MAP 0
#define PHALCON_MVC_MODEL_METADATA_MODELS_REVERSE_COLUMN_MAP 1

#endif /* PHALCON_MVC_MODEL_METADATA_H */


Expand Down Expand Up @@ -5861,6 +5879,18 @@ PHALCON_INIT_CLASS(Phalcon_Queue_Beanstalk_Job);
#endif /* PHALCON_QUEUE_BEANSTALK_JOB_H */


#ifndef PHALCON_REGISTRY_H
#define PHALCON_REGISTRY_H

#include "php_phalcon.h"

zend_class_entry *phalcon_registry_ce;

PHALCON_INIT_CLASS(Phalcon_Registry);

#endif /* PHALCON_REGISTRY_H */



#ifndef PHALCON_SECURITY_H
#define PHALCON_SECURITY_H
Expand Down Expand Up @@ -6067,10 +6097,6 @@ zend_class_entry *phalcon_translate_adapterinterface_ce;

PHALCON_INIT_CLASS(Phalcon_Translate_AdapterInterface);

ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_translate_adapterinterface___construct, 0, 0, 1)
ZEND_ARG_INFO(0, options)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_translate_adapterinterface_query, 0, 0, 1)
ZEND_ARG_INFO(0, index)
ZEND_ARG_INFO(0, placeholders)
Expand Down
Loading