github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Sql: S_type now supports GetWidth

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6741 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-01-10 13:26:48 +00:00
parent 6893d7897c
commit e461d6f43f
8 changed files with 56 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
uppsrc/Sql/S_info.cpp
View file

@ -5,12 +5,26 @@ NAMESPACE_UPP
void S_info_maker::Field(const char *name, Ref f, bool *b)
{
if(b) f = Ref(*b);
info.column.Add(name, MakeTuple((byte *)f.GetVoidPtr() - (byte *)s, f.GetManager()));
S_info::Column& c = info.column.Add(name);
c.offset = (byte *)f.GetVoidPtr() - (byte *)s;
c.manager = f.GetManager();
c.width = 0;
}
void S_info_maker::Width(int width)
{
info.column.Top().width = width;
}
Ref S_info::GetRef(const void *s, int i) const
{
return Ref((byte *)s + column[i].a, column[i].b);
return Ref((byte *)s + column[i].offset, column[i].manager);
}
int S_info::GetWidth(const SqlId& id) const
{
int q = column.Find(~id);
return q >= 0 ? GetWidth(q) : 0;
}
Ref S_info::GetRef(const void *s, const SqlId& id) const

3
uppsrc/Sql/Sql.cpp
View file

@ -26,6 +26,9 @@ void FieldOperator::Field(const char *name, Ref f) { Field(f); }
void FieldOperator::Field(const char *name, Ref f, bool *b) { Field(name, f); }
void FieldOperator::Width(int width) {}
FieldOperator& FieldOperator::operator()(const char *name, bool& b) {
String x = BoolToSql(b);
Field(name, x, &b);

18
uppsrc/Sql/SqlSchema.h
View file

@ -132,13 +132,22 @@ String ExportIds(const String& database);
#endif
struct S_info {
VectorMap< String, Tuple2<intptr_t, RefManager *> > column;
struct Column : Moveable<Column> {
intptr_t offset;
RefManager *manager;
int width;
};
VectorMap<String, Column> column;
SqlSet set;
Vector<SqlId> ids;
SqlId GetId(int i) const { return column.GetKey(i); }
int GetCount() const { return column.GetCount(); }
SqlId GetId(int i) const { return column.GetKey(i); }
int GetWidth(int i) const { return column[i].width; }
int GetWidth(const SqlId& id) const;
Ref GetRef(const void *s, int i) const;
Ref GetRef(const void *s, const SqlId& id) const;
Value Get(const void *s, const SqlId& id) const;
@ -160,7 +169,8 @@ struct S_info_maker : FieldOperator {
void *s;
virtual void Field(const char *name, Ref f, bool *b);
virtual void Width(int width);
S_info_maker(S_info& f, void *s) : info(f), s(s) {}
};
@ -184,6 +194,8 @@ struct S_type {
int GetCount() const;
SqlId GetId(int i) const;
int GetWidth(int i) const;
int GetWidth(const SqlId& id) const;
Ref GetRef(int i);
Ref GetRef(const SqlId& id);
Value Get(const SqlId& id) const;

2
uppsrc/Sql/Sqlexp.h
View file

@ -31,6 +31,8 @@ struct FieldOperator {
FieldOperator& operator()(const char *name, bool& b);
FieldOperator& operator()(const String& name, bool& b) { return (*this)(~name, b); }
FieldOperator& operator()(Id id, bool& b) { return (*this)(~id, b); }
virtual void Width(int width); // Only to be used for S_info
FieldOperator();
virtual ~FieldOperator();

2
uppsrc/Sql/sch_header.h
View file

@ -23,6 +23,8 @@ public: \
String ToString() const { return AsString((Fields)const_cast<S_##Table&>(*this)); } \
int GetCount() const { return info->GetCount(); } \
SqlId GetId(int i) const { return info->GetId(i); } \
int GetWidth(int i) const { return info->GetWidth(i); } \
int GetWidth(const SqlId& id) const { return info->GetWidth(id); } \
Ref GetRef(int i) { return info->GetRef(this, i); } \
Ref GetRef(const SqlId& id) { return info->GetRef(this, id); } \
Value Get(const SqlId& id) const { return info->Get(this, id); } \

4
uppsrc/Sql/sch_source.h
View file

@ -91,11 +91,11 @@ void S_##x::FieldLayoutRaw(FieldOperator& fo, const String& prefix) {\
S_##b2::FieldLayoutRaw(fo, prefix);\
S_##b3::FieldLayoutRaw(fo, prefix);
#define COLUMN(type, ctype, name, width, prec) fo(prefix + #name, ADD_SCHEMA_PREFIX_CPP(name));
#define COLUMN(type, ctype, name, width, prec) fo(prefix + #name, ADD_SCHEMA_PREFIX_CPP(name)), fo.Width(width);
#define COLUMN_ARRAY(type, ctype, name, width, prec, items) \
{ \
for(int i = 0; i < items; i++)\
fo(Format("%s%s%d", ~prefix, #name, i), ADD_SCHEMA_PREFIX_CPP(name)[i]); \
fo(Format("%s%s%d", ~prefix, #name, i), ADD_SCHEMA_PREFIX_CPP(name)[i]), fo.Width(width); \
}
#define VAR(type, x) x.FieldLayoutRaw(fo, prefix + #x + "$");

12
uppsrc/Sql/src.tpp/S_type$en-us.tpp
View file

@ -94,6 +94,18 @@ purposes.&]
onst]&]
[s2; Returns a column ID for column at [%-*@3 i].&]
[s3; &]
[s4;%- &]
[s5;:S`_type`:`:GetWidth`(int`)const:%- [@(0.0.255) int]_[* GetWidth]([@(0.0.255) int]_[*@3 i
])_[@(0.0.255) const]&]
[s2; Returns the width of column (usually text) as defined in the
schema. If column does not have width, returns 0.&]
[s3; &]
[s4;%- &]
[s5;:S`_type`:`:GetWidth`(const SqlId`&`)const:%- [@(0.0.255) int]_[* GetWidth]([@(0.0.255) c
onst]_[_^SqlId^ SqlId][@(0.0.255) `&]_[*@3 id])_[@(0.0.255) const]&]
[s2; Returns the width of column (usually text) as defined in the
schema.If [%-*@3 id] is not in S`_[/ type], returns 0.&]
[s3; &]
[s4; &]
[s5;:S`_type`:`:GetRef`(int`):%- [_^Ref^ Ref]_[* GetRef]([@(0.0.255) int]_[*@3 i])&]
[s2; Returns a reference to column at [%-*@3 i].&]

8
uppsrc/plugin/sqlite3/Sqlite3Schema.h
View file

@ -13,10 +13,10 @@
#define DOUBLE_(x) COLUMN_("real", double, x, 0, 0)
#define DOUBLE_ARRAY_(x, items) COLUMN_ARRAY_("real", double, x, 0, 0, items)
#define STRING(x, n) COLUMN("text", String, x, 0, 0)
#define STRING_ARRAY(x, n, items) COLUMN_ARRAY("text", String, x, 0, 0, items)
#define STRING_(x, n) COLUMN_("text", String, x, 0, 0)
#define STRING_ARRAY_(x, n, items) COLUMN_ARRAY_("text", String, x, 0, 0, items)
#define STRING(x, n) COLUMN("text", String, x, n, 0)
#define STRING_ARRAY(x, n, items) COLUMN_ARRAY("text", String, x, n, 0, items)
#define STRING_(x, n) COLUMN_("text", String, x, n, 0)
#define STRING_ARRAY_(x, n, items) COLUMN_ARRAY_("text", String, x, n, 0, items)
#define DATE(x) COLUMN("date", Date, x, 0, 0)
#define DATE_ARRAY(x, items) COLUMN_ARRAY("date", Date, x, 0, 0, items)