").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c)
-{if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g
=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
diff --git a/doc/html/mysqlgenerator_8h_source.html b/doc/html/mysqlgenerator_8h_source.html
deleted file mode 100644
index 38ebdd1..0000000
--- a/doc/html/mysqlgenerator_8h_source.html
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-Nut: src/mysqlgenerator.h Source File
-
-
-
-
-
-
- Nut
- 0.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
21 #ifndef MYSQLGENERATOR_H
-
22 #define MYSQLGENERATOR_H
-
-
24 #include <QtCore/qglobal.h>
-
25 #include "sqlgeneratorbase_p.h"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
40 #endif // MYSQLGENERATOR_H
-
Nut: src/postgresqlgenerator.h Source File
-
-
-
-
-
-
- Nut
- 0.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
21 #ifndef POSTGRESQLGENERATOR_H
-
22 #define POSTGRESQLGENERATOR_H
-
-
24 #include <QtCore/qglobal.h>
-
25 #include "sqlgeneratorbase_p.h"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
41 #endif // POSTGRESQLGENERATOR_H
-
Nut: src/query.h Source File
-
-
-
-
-
-
- Nut
- 0.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
24 #include <QtCore/QVariant>
-
25 #include <QtCore/QDebug>
-
26 #include <QtCore/QScopedPointer>
-
27 #include <QtCore/QRegularExpression>
-
-
-
-
31 #include "databasemodel.h"
-
32 #include "tablesetbase_p.h"
-
33 #include "sqlgeneratorbase_p.h"
-
34 #include "querybase_p.h"
-
35 #include "wherephrase.h"
-
-
-
-
-
40 class NUT_EXPORT
Query :
public QueryBase
-
-
-
43 Q_DECLARE_PRIVATE(
Query )
-
-
-
-
-
-
49 QList<T *> toList(
int count = -1);
-
-
-
-
-
-
-
-
-
-
-
-
-
62 Query<T> *join(
const QString &tableName);
-
-
-
-
66 join(c->metaObject()->className());
-
-
-
-
-
71 Query<T> *orderBy(QString fieldName, QString type);
-
-
-
-
-
-
77 d_ptr(new QueryPrivate(this))
-
-
-
-
81 d->database = database;
-
82 d->tableSet = tableSet;
-
83 d->tableName = d->database->tableName(T::staticMetaObject.className());
-
-
-
-
-
-
89 qDebug() <<
"Query::~Query()" ;
-
-
-
-
-
-
-
-
-
-
-
-
-
102 QSqlQuery q = d->database->exec(d->database->sqlGenertor()->selectCommand(
-
103 SqlGeneratorBase::SelectALl,
-
-
-
-
-
-
-
110 QString pk =d->database->model().model(d->tableName)->primaryKey();
-
111 QVariant lastPkValue = QVariant();
-
-
-
114 TableSetBase *childTableSet;
-
115 QStringList masterFields = d->database->model().model(d->tableName)->fieldsNames();
-
116 QStringList childFields;
-
117 if (!d->joinClassName.isNull())
-
118 if (d->database->model().modelByClass(d->joinClassName)){
-
119 childFields = d->database->model().modelByClass(d->joinClassName)->fieldsNames();
-
120 QString joinTableName = d->database->tableName(d->joinClassName);
-
121 childTypeId = d->database->model().model(joinTableName)->typeId();
-
-
-
-
125 if (lastPkValue != q.value(pk)){
-
-
-
128 foreach (QString field, masterFields)
-
129 t->setProperty(field.toLatin1().data(), q.value(field));
-
-
131 t->setTableSet(d->tableSet);
-
132 t->setStatus(Table::FeatchedFromDB);
-
-
-
-
-
-
-
139 QSet<TableSetBase*> tableSets = t->tableSets;
-
140 foreach (TableSetBase *ts, tableSets)
-
141 if (ts->childClassName() == d->joinClassName)
-
-
-
-
-
-
147 const QMetaObject *childMetaObject = QMetaType::metaObjectForType(childTypeId);
-
148 Table *childTable = qobject_cast<
Table *>(childMetaObject->newInstance());
-
-
150 foreach (QString field, childFields)
-
151 childTable->setProperty(field.toLatin1().data(), q.value(field));
-
-
153 childTable->setParent(
this );
-
154 childTable->setParentTable(lastRow);
-
155 childTable->setStatus(Table::FeatchedFromDB);
-
156 childTable->setTableSet(childTableSet);
-
157 childTableSet->add(childTable);
-
-
159 lastPkValue = q.value(pk);
-
-
-
-
-
-
-
-
-
-
-
-
-
172 QList<T *> list = toList(1);
-
-
-
-
-
-
-
-
-
-
-
-
-
185 d->select =
"COUNT(*)" ;
-
186 QSqlQuery q = d->database->exec(d->database->sqlGenertor()->selectCommand(
"COUNT(*)" , d->wheres, d->orders, d->tableName, d->joinClassName));
-
-
-
189 return q.value(0).toInt();
-
-
-
-
-
-
-
-
197 QSqlQuery q = d->database->exec(d->database->sqlGenertor()->selectCommand(
"MAX(" + f.data()->text +
")" , d->wheres, d->orders, d->tableName, d->joinClassName));
-
-
-
200 return q.value(0).toInt();
-
-
-
-
-
-
-
-
208 QSqlQuery q = d->database->exec(d->database->sqlGenertor()->selectCommand(
"MIN(" + f.data()->text +
")" , d->wheres, d->orders, d->tableName, d->joinClassName));
-
-
-
211 return q.value(0).toInt();
-
-
-
-
-
-
-
-
-
220 QString sql = d->database->sqlGenertor()->deleteCommand(d->wheres, d->tableName);
-
-
-
223 QSqlQuery q = d->database->exec(sql);
-
224 return q.numRowsAffected();
-
-
-
-
-
-
-
231 d->joinClassName = tableName;
-
-
-
-
-
-
-
-
239 d->wheres.append(where);
-
-
-
-
-
-
-
-
247 d->orders.insert(fieldName, type);
-
-
-
-
-
-
-
-
255 d->orderPhrases.append(phrase);
-
-
-
-
-
-
-
Nut: src/query_p.h Source File
-
-
-
-
-
-
- Nut
- 0.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
24 #include "wherephrase.h"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
43 QString joinClassName;
-
44 QList<WherePhrase> wheres;
-
45 QHash<QString, QString> orders;
-
46 QList<WherePhrase> orderPhrases;
-
-
-
-
Nut: src/querybase_p.h Source File
-
-
-
-
-
-
- Nut
- 0.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
4 #include <QtCore/QObject>
-
5 #include <QtCore/qglobal.h>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
-
Loading...
-
-
-
Searching...
-
No Matches
-
-
do a search
- {
- this.Search();
- }
- }
-
- this.OnSearchSelectKey = function(evt)
- {
- var e = (evt) ? evt : window.event; // for IE
- if (e.keyCode==40 && this.searchIndex0) // Up
- {
- this.searchIndex--;
- this.OnSelectItem(this.searchIndex);
- }
- else if (e.keyCode==13 || e.keyCode==27)
- {
- this.OnSelectItem(this.searchIndex);
- this.CloseSelectionWindow();
- this.DOMSearchField().focus();
- }
- return false;
- }
-
- // --------- Actions
-
- // Closes the results window.
- this.CloseResultsWindow = function()
- {
- this.DOMPopupSearchResultsWindow().style.display = 'none';
- this.DOMSearchClose().style.display = 'none';
- this.Activate(false);
- }
-
- this.CloseSelectionWindow = function()
- {
- this.DOMSearchSelectWindow().style.display = 'none';
- }
-
- // Performs a search.
- this.Search = function()
- {
- this.keyTimeout = 0;
-
- // strip leading whitespace
- var searchValue = this.DOMSearchField().value.replace(/^ +/, "");
-
- var code = searchValue.toLowerCase().charCodeAt(0);
- var hexCode;
- if (code<16)
- {
- hexCode="0"+code.toString(16);
- }
- else
- {
- hexCode=code.toString(16);
- }
-
- var resultsPage;
- var resultsPageWithSearch;
- var hasResultsPage;
-
- if (indexSectionsWithContent[this.searchIndex].charAt(code) == '1')
- {
- resultsPage = this.resultsPath + '/' + indexSectionNames[this.searchIndex] + '_' + hexCode + '.html';
- resultsPageWithSearch = resultsPage+'?'+escape(searchValue);
- hasResultsPage = true;
- }
- else // nothing available for this search term
- {
- resultsPage = this.resultsPath + '/nomatches.html';
- resultsPageWithSearch = resultsPage;
- hasResultsPage = false;
- }
-
- window.frames.MSearchResults.location = resultsPageWithSearch;
- var domPopupSearchResultsWindow = this.DOMPopupSearchResultsWindow();
-
- if (domPopupSearchResultsWindow.style.display!='block')
- {
- var domSearchBox = this.DOMSearchBox();
- this.DOMSearchClose().style.display = 'inline';
- if (this.insideFrame)
- {
- var domPopupSearchResults = this.DOMPopupSearchResults();
- domPopupSearchResultsWindow.style.position = 'relative';
- domPopupSearchResultsWindow.style.display = 'block';
- var width = document.body.clientWidth - 8; // the -8 is for IE :-(
- domPopupSearchResultsWindow.style.width = width + 'px';
- domPopupSearchResults.style.width = width + 'px';
- }
- else
- {
- var domPopupSearchResults = this.DOMPopupSearchResults();
- var left = getXPos(domSearchBox) + 150; // domSearchBox.offsetWidth;
- var top = getYPos(domSearchBox) + 20; // domSearchBox.offsetHeight + 1;
- domPopupSearchResultsWindow.style.display = 'block';
- left -= domPopupSearchResults.offsetWidth;
- domPopupSearchResultsWindow.style.top = top + 'px';
- domPopupSearchResultsWindow.style.left = left + 'px';
- }
- }
-
- this.lastSearchValue = searchValue;
- this.lastResultsPage = resultsPage;
- }
-
- // -------- Activation Functions
-
- // Activates or deactivates the search panel, resetting things to
- // their default values if necessary.
- this.Activate = function(isActive)
- {
- if (isActive || // open it
- this.DOMPopupSearchResultsWindow().style.display == 'block'
- )
- {
- this.DOMSearchBox().className = 'MSearchBoxActive';
-
- var searchField = this.DOMSearchField();
-
- if (searchField.value == this.searchLabel) // clear "Search" term upon entry
- {
- searchField.value = '';
- this.searchActive = true;
- }
- }
- else if (!isActive) // directly remove the panel
- {
- this.DOMSearchBox().className = 'MSearchBoxInactive';
- this.DOMSearchField().value = this.searchLabel;
- this.searchActive = false;
- this.lastSearchValue = ''
- this.lastResultsPage = '';
- }
- }
-}
-
-// -----------------------------------------------------------------------
-
-// The class that handles everything on the search results page.
-function SearchResults(name)
-{
- // The number of matches from the last run of .
- this.lastMatchCount = 0;
- this.lastKey = 0;
- this.repeatOn = false;
-
- // Toggles the visibility of the passed element ID.
- this.FindChildElement = function(id)
- {
- var parentElement = document.getElementById(id);
- var element = parentElement.firstChild;
-
- while (element && element!=parentElement)
- {
- if (element.nodeName == 'DIV' && element.className == 'SRChildren')
- {
- return element;
- }
-
- if (element.nodeName == 'DIV' && element.hasChildNodes())
- {
- element = element.firstChild;
- }
- else if (element.nextSibling)
- {
- element = element.nextSibling;
- }
- else
- {
- do
- {
- element = element.parentNode;
- }
- while (element && element!=parentElement && !element.nextSibling);
-
- if (element && element!=parentElement)
- {
- element = element.nextSibling;
- }
- }
- }
- }
-
- this.Toggle = function(id)
- {
- var element = this.FindChildElement(id);
- if (element)
- {
- if (element.style.display == 'block')
- {
- element.style.display = 'none';
- }
- else
- {
- element.style.display = 'block';
- }
- }
- }
-
- // Searches for the passed string. If there is no parameter,
- // it takes it from the URL query.
- //
- // Always returns true, since other documents may try to call it
- // and that may or may not be possible.
- this.Search = function(search)
- {
- if (!search) // get search word from URL
- {
- search = window.location.search;
- search = search.substring(1); // Remove the leading '?'
- search = unescape(search);
- }
-
- search = search.replace(/^ +/, ""); // strip leading spaces
- search = search.replace(/ +$/, ""); // strip trailing spaces
- search = search.toLowerCase();
- search = convertToId(search);
-
- var resultRows = document.getElementsByTagName("div");
- var matches = 0;
-
- var i = 0;
- while (i < resultRows.length)
- {
- var row = resultRows.item(i);
- if (row.className == "SRResult")
- {
- var rowMatchName = row.id.toLowerCase();
- rowMatchName = rowMatchName.replace(/^sr\d*_/, ''); // strip 'sr123_'
-
- if (search.length<=rowMatchName.length &&
- rowMatchName.substr(0, search.length)==search)
- {
- row.style.display = 'block';
- matches++;
- }
- else
- {
- row.style.display = 'none';
- }
- }
- i++;
- }
- document.getElementById("Searching").style.display='none';
- if (matches == 0) // no results
- {
- document.getElementById("NoMatches").style.display='block';
- }
- else // at least one result
- {
- document.getElementById("NoMatches").style.display='none';
- }
- this.lastMatchCount = matches;
- return true;
- }
-
- // return the first item with index index or higher that is visible
- this.NavNext = function(index)
- {
- var focusItem;
- while (1)
- {
- var focusName = 'Item'+index;
- focusItem = document.getElementById(focusName);
- if (focusItem && focusItem.parentNode.parentNode.style.display=='block')
- {
- break;
- }
- else if (!focusItem) // last element
- {
- break;
- }
- focusItem=null;
- index++;
- }
- return focusItem;
- }
-
- this.NavPrev = function(index)
- {
- var focusItem;
- while (1)
- {
- var focusName = 'Item'+index;
- focusItem = document.getElementById(focusName);
- if (focusItem && focusItem.parentNode.parentNode.style.display=='block')
- {
- break;
- }
- else if (!focusItem) // last element
- {
- break;
- }
- focusItem=null;
- index--;
- }
- return focusItem;
- }
-
- this.ProcessKeys = function(e)
- {
- if (e.type == "keydown")
- {
- this.repeatOn = false;
- this.lastKey = e.keyCode;
- }
- else if (e.type == "keypress")
- {
- if (!this.repeatOn)
- {
- if (this.lastKey) this.repeatOn = true;
- return false; // ignore first keypress after keydown
- }
- }
- else if (e.type == "keyup")
- {
- this.lastKey = 0;
- this.repeatOn = false;
- }
- return this.lastKey!=0;
- }
-
- this.Nav = function(evt,itemIndex)
- {
- var e = (evt) ? evt : window.event; // for IE
- if (e.keyCode==13) return true;
- if (!this.ProcessKeys(e)) return false;
-
- if (this.lastKey==38) // Up
- {
- var newIndex = itemIndex-1;
- var focusItem = this.NavPrev(newIndex);
- if (focusItem)
- {
- var child = this.FindChildElement(focusItem.parentNode.parentNode.id);
- if (child && child.style.display == 'block') // children visible
- {
- var n=0;
- var tmpElem;
- while (1) // search for last child
- {
- tmpElem = document.getElementById('Item'+newIndex+'_c'+n);
- if (tmpElem)
- {
- focusItem = tmpElem;
- }
- else // found it!
- {
- break;
- }
- n++;
- }
- }
- }
- if (focusItem)
- {
- focusItem.focus();
- }
- else // return focus to search field
- {
- parent.document.getElementById("MSearchField").focus();
- }
- }
- else if (this.lastKey==40) // Down
- {
- var newIndex = itemIndex+1;
- var focusItem;
- var item = document.getElementById('Item'+itemIndex);
- var elem = this.FindChildElement(item.parentNode.parentNode.id);
- if (elem && elem.style.display == 'block') // children visible
- {
- focusItem = document.getElementById('Item'+itemIndex+'_c0');
- }
- if (!focusItem) focusItem = this.NavNext(newIndex);
- if (focusItem) focusItem.focus();
- }
- else if (this.lastKey==39) // Right
- {
- var item = document.getElementById('Item'+itemIndex);
- var elem = this.FindChildElement(item.parentNode.parentNode.id);
- if (elem) elem.style.display = 'block';
- }
- else if (this.lastKey==37) // Left
- {
- var item = document.getElementById('Item'+itemIndex);
- var elem = this.FindChildElement(item.parentNode.parentNode.id);
- if (elem) elem.style.display = 'none';
- }
- else if (this.lastKey==27) // Escape
- {
- parent.searchBox.CloseResultsWindow();
- parent.document.getElementById("MSearchField").focus();
- }
- else if (this.lastKey==13) // Enter
- {
- return true;
- }
- return false;
- }
-
- this.NavChild = function(evt,itemIndex,childIndex)
- {
- var e = (evt) ? evt : window.event; // for IE
- if (e.keyCode==13) return true;
- if (!this.ProcessKeys(e)) return false;
-
- if (this.lastKey==38) // Up
- {
- if (childIndex>0)
- {
- var newIndex = childIndex-1;
- document.getElementById('Item'+itemIndex+'_c'+newIndex).focus();
- }
- else // already at first child, jump to parent
- {
- document.getElementById('Item'+itemIndex).focus();
- }
- }
- else if (this.lastKey==40) // Down
- {
- var newIndex = childIndex+1;
- var elem = document.getElementById('Item'+itemIndex+'_c'+newIndex);
- if (!elem) // last child, jump to parent next parent
- {
- elem = this.NavNext(itemIndex+1);
- }
- if (elem)
- {
- elem.focus();
- }
- }
- else if (this.lastKey==27) // Escape
- {
- parent.searchBox.CloseResultsWindow();
- parent.document.getElementById("MSearchField").focus();
- }
- else if (this.lastKey==13) // Enter
- {
- return true;
- }
- return false;
- }
-}
-
-function setKeyActions(elem,action)
-{
- elem.setAttribute('onkeydown',action);
- elem.setAttribute('onkeypress',action);
- elem.setAttribute('onkeyup',action);
-}
-
-function setClassAttr(elem,attr)
-{
- elem.setAttribute('class',attr);
- elem.setAttribute('className',attr);
-}
-
-function createResults()
-{
- var results = document.getElementById("SRResults");
- for (var e=0; e
-
-
-Nut: src/sqlgeneratorbase_p.h Source File
-
-
-
-
-
-
- Nut
- 0.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
21 #ifndef SQLGENERATORBASE_H
-
22 #define SQLGENERATORBASE_H
-
-
24 #include <QtCore/qglobal.h>
-
25 #include <QtCore/QObject>
-
26 #include <QtCore/QStringList>
-
27 #include "wherephrase.h"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
61 virtual QString masterDatabaseName(QString databaseName);
-
-
63 virtual QString fieldType(
FieldModel *field) = 0;
-
64 virtual QString fieldDeclare(
FieldModel *field);
-
-
-
-
-
-
70 virtual QString saveRecord(
Table *t, QString tableName);
-
71 virtual QString insertRecord(
Table *t, QString tableName);
-
72 virtual QString updateRecord(
Table *t, QString tableName);
-
73 virtual QString deleteRecord(
Table *t, QString tableName);
-
-
-
76 virtual QString deleteRecords(QString tableName, QString where);
-
-
78 virtual QString selectCommand(AgregateType t, QString agregateArg,
-
79 QList<WherePhrase> &wheres, QList<WherePhrase> &orders,
-
80 QString tableName, QString joinClassName);
-
-
82 virtual QString selectCommand(QList<WherePhrase> &wheres, QHash<QString, QString> &orders,
-
83 QString tableName, QString joinClassName);
-
84 virtual QString selectCommand(QString selectPhrase,
-
85 QList<WherePhrase> &wheres, QHash<QString, QString> &orders,
-
86 QString tableName, QString joinClassName);
-
-
88 virtual QString deleteCommand(QList<WherePhrase> &wheres, QString tableName);
-
-
90 virtual QString escapeValue(
const QVariant &v)
const ;
-
91 virtual QString phrase(
const PhraseData *d)
const ;
-
92 virtual QString operatorString(
const PhraseData::Condition &cond)
const ;
-
-
-
95 QString agregateText(
const AgregateType &t,
const QString &arg = QString::null)
const ;
-
96 QString fromTableText(
const QString &tableName, QString &joinClassName, QString &orderBy)
const ;
-
97 QString createWhere(QList<WherePhrase> &wheres);
-
98 QString phraseOrder(
const PhraseData *d)
const ;
-
-
-
-
-
103 #endif // SQLGENERATORBASE_H
-
Nut: src/sqlitegenerator.h Source File
-
-
-
-
-
-
- Nut
- 0.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
21 #ifndef SQLITEGENERATOR_H
-
22 #define SQLITEGENERATOR_H
-
-
24 #include <QtCore/qglobal.h>
-
25 #include "sqlgeneratorbase_p.h"
-
-
-
-
-
-
-
-
-
-
35 #endif // SQLITEGENERATOR_H
-
Nut: src/sqlservergenerator.h Source File
-
-
-
-
-
-
- Nut
- 0.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
21 #ifndef SQLSERVERGENERATOR_H
-
22 #define SQLSERVERGENERATOR_H
-
-
24 #include <QtCore/qglobal.h>
-
25 #include "sqlgeneratorbase_p.h"
-
-
-
-
-
-
-
-
-
34 QString masterDatabaseName(QString databaseName);
-
-
-
-
-
39 QString escapeValue(
const QVariant &v)
const ;
-
-
-
-
-
44 #endif // SQLSERVERGENERATOR_H
-
Nut: Member List
-
-
-
-
-
-
- Nut
- 0.1
-
-
-
-
-
-
-
-
-
-
-
-
-
This is the complete list of members for FieldModel , including all inherited members.
-
Nut: FieldModel Struct Reference
-
-
-
-
-
-
- Nut
- 0.1
-
-
-
-
-
-
-
-
-
-
-
-
-operator== (const FieldModel &f) const operator!= (const FieldModel &f) const
-name type length defaultValue notNull isPrimaryKey isAutoIncrement isUnique
-
The documentation for this struct was generated from the following file:
-
Nut: Member List
-
-
-
-
-
-
- Nut
- 0.1
-
-
-
-
-
-
-
-
-
-
-
-
-
This is the complete list of members for RelationModel , including all inherited members.
-
Nut: RelationModel Struct Reference
-
-
-
-
-
-
- Nut
- 0.1
-
-
-
-
-
-
-
-
-
-
-
-
-className localColumn TableModel * table foregionColumn
-
The documentation for this struct was generated from the following file:
-
Nut: src/table.h Source File
-
-
-
-
-
-
- Nut
- 0.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
24 #include <QtCore/QObject>
-
25 #include <QtCore/qglobal.h>
-
26 #include <QtCore/QSet>
-
-
28 #include "tablemodel.h"
-
-
30 #include "wherephrase.h"
-
-
-
-
-
-
36 class NUT_EXPORT
Table :
public QObject
-
-
-
-
-
41 explicit Table (QObject *tableSet = 0);
-
-
-
-
-
-
-
-
-
-
51 void add(TableSetBase *);
-
-
-
54 QString primaryKey()
const ;
-
55 bool isPrimaryKeyAutoIncrement()
const ;
-
56 QVariant primaryValue()
const ;
-
57 Status status()
const ;
-
58 void setStatus(
const Status &status);
-
-
60 TableSetBase *tableSet()
const ;
-
61 void setTableSet(TableSetBase *tableSet);
-
-
63 QSet<QString> changedProperties()
const ;
-
-
65 bool setParentTable(
Table *master);
-
-
-
-
-
-
71 void propertyChanged(QString propName);
-
-
-
-
75 QSet<QString> _changedProperties;
-
76 TableSetBase *_tableSet;
-
-
78 QSet<TableSetBase*> tableSets;
-
-
-
-
-
-
-
-
-
Nut: src/tablemodel.h Source File
-
-
-
-
-
-
- Nut
- 0.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
21 #ifndef TABLESCHEEMA_H
-
22 #define TABLESCHEEMA_H
-
-
24 #include <QtCore/QVariant>
-
-
-
-
-
-
30 FieldModel () : name(QString::null), length(0), defaultValue(QString::null),
-
31 notNull(
false ), isPrimaryKey(
false ), isAutoIncrement(
false ), isUnique(
false )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
47 bool b = name == f.name
-
-
-
50 && defaultValue == f.defaultValue
-
51 && notNull == f.notNull;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
65 QString foregionColumn;
-
-
-
-
-
-
-
72 TableModel (QJsonObject json, QString tableName);
-
-
74 QJsonObject toJson()
const ;
-
-
-
-
-
-
-
-
-
83 QString toString()
const ;
-
-
85 QString primaryKey()
const ;
-
-
-
88 void setName(
const QString &name);
-
-
90 QString className()
const ;
-
91 void setClassName(
const QString &className);
-
-
-
94 void setTypeId(
const int &typeId);
-
95 QList<FieldModel *> fields()
const ;
-
96 QList<RelationModel *> foregionKeys()
const ;
-
97 QStringList fieldsNames()
const ;
-
-
-
-
101 static TableModel *findByClassName(QString className);
-
-
-
-
-
-
-
-
-
110 QList<FieldModel*> _fields;
-
111 QList<RelationModel*> _foregionKeys;
-
112 static QSet<TableModel*>_allModels;
-
-
-
115 #endif // TABLESCHEEMA_H
-
Nut: src/tableset.h Source File
-
-
-
-
-
-
- Nut
- 0.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
24 #include <QtCore/qglobal.h>
-
25 #include <QtCore/QVariant>
-
26 #include <QtCore/QMetaMethod>
-
27 #include <QtSql/QSqlQuery>
-
-
29 #include "tablesetbase_p.h"
-
-
-
-
-
-
-
-
-
-
39 class NUT_EXPORT
TableSet :
public TableSetBase
-
-
-
-
-
-
-
46 void append(QList<T*> t);
-
-
48 void remove (QList<T*> t);
-
-
50 inline T type()
const {}
-
-
-
-
54 const T &operator[](
int i)
const ;
-
-
-
-
-
-
-
61 _childClassName = T::staticMetaObject.className();
-
-
-
-
65 Q_OUTOFLINE_TEMPLATE TableSet<T>::TableSet(
Table *parent) : TableSetBase(parent)
-
-
67 _childClassName = T::staticMetaObject.className();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
81 return _tables.count();
-
-
-
-
-
-
87 return (T*)_tablesList.at(i);
-
-
-
-
-
-
93 return _tablesList[i];
-
-
-
-
-
-
-
100 _tablesList.append(t);
-
-
102 t->setTableSet(
this );
-
103 if (t->status() != Table::FeatchedFromDB)
-
104 t->setStatus(Table::Added);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
118 t->setStatus(Table::Deleted);
-
-
-
-
-
-
-
-
-
-
-
-
-
Nut: src/tablesetbase_p.h Source File
-
-
-
-
-
-
- Nut
- 0.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
21 #ifndef TABLESETBASE_H
-
22 #define TABLESETBASE_H
-
-
24 #include <QtCore/QObject>
-
25 #include <QtCore/qglobal.h>
-
26 #include <QtCore/QSet>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
42 QString childClassName()
const ;
-
-
-
45 void setDatabase(
Database *database);
-
-
-
-
49 QList<Table*> _tablesList;
-
-
-
-
53 QString _childClassName;
-
-
-
56 #endif // TABLESETBASE_H
-
Nut: src/wherephrase.h Source File
-
-
-
-
-
-
- Nut
- 0.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
24 #include <QtCore/qglobal.h>
-
-
-
-
-
-
30 #include <QSharedPointer>
-
-
-
-
34 class SqlGeneratorBase;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
76 Condition operatorCond;
-
-
-
-
-
-
-
83 PhraseData (
const char *className,
const char * s);
-
-
-
-
-
-
-
-
-
-
-
94 QSharedPointer<PhraseData> _dataPointer;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
#include
@@ -47,27 +48,35 @@
NUT_BEGIN_NAMESPACE
-int DatabasePrivate::lastId = 0;
+qulonglong DatabasePrivate::lastId = 0;
QMap DatabasePrivate::allTableMaps;
-DatabasePrivate::DatabasePrivate(Database *parent) : q_ptr(parent)
+DatabasePrivate::DatabasePrivate(Database *parent) : q_ptr(parent), isDatabaseNew(false)
{
}
bool DatabasePrivate::open(bool update)
{
+ if (db.isOpen())
+ return true;
Q_Q(Database);
// if (update)
- bool isNew = getCurrectScheema();
-
connectionName = q->metaObject()->className()
+ QString::number(DatabasePrivate::lastId);
db = QSqlDatabase::addDatabase(driver, connectionName);
db.setHostName(hostName);
+ db.setPort(port);
db.setDatabaseName(databaseName);
db.setUserName(userName);
db.setPassword(password);
+
+ if (driver.toLower().startsWith("qsqlite")
+ && !QFile::exists(databaseName)) {
+ //Force to execute update database
+ isDatabaseNew = true;
+ update = true;
+ }
bool ok = db.open();
if (!ok) {
@@ -79,6 +88,8 @@ bool DatabasePrivate::open(bool update)
|| db.lastError().text().contains("Cannot open database")
|| db.lastError().text().contains("Unknown database '"
+ databaseName + "'")) {
+
+ db.close();
db.setDatabaseName(sqlGenertor->masterDatabaseName(databaseName));
ok = db.open();
qDebug("Creating database");
@@ -86,10 +97,13 @@ bool DatabasePrivate::open(bool update)
db.exec("CREATE DATABASE " + databaseName);
db.close();
- if (db.lastError().type() != QSqlError::NoError)
+ if (db.lastError().type() != QSqlError::NoError) {
qWarning("Creating database error: %s",
db.lastError().text().toLatin1().data());
+ return false;
+ }
+ isDatabaseNew = true;
return open(update);
} else {
qWarning("Unknown error detecting change logs, %s",
@@ -99,7 +113,7 @@ bool DatabasePrivate::open(bool update)
return false;
}
- if(isNew)
+ if(update)
return updateDatabase();
else
return true;
@@ -109,7 +123,10 @@ bool DatabasePrivate::updateDatabase()
{
Q_Q(Database);
- DatabaseModel last = getLastScheema();
+ if (!getCurrectScheema())
+ return true;
+
+ DatabaseModel last = isDatabaseNew ? DatabaseModel() : getLastScheema();
DatabaseModel current = currentModel;
if (last == current) {
@@ -123,30 +140,28 @@ bool DatabasePrivate::updateDatabase()
qDebug("Databse is changed");
QStringList sql = sqlGenertor->diff(last, current);
+
db.transaction();
foreach (QString s, sql) {
db.exec(s);
if (db.lastError().type() != QSqlError::NoError)
- qWarning("Error executing sql command, %s",
+ qWarning("Error executing sql command `%s`, %s",
+ qPrintable(s),
db.lastError().text().toLatin1().data());
}
- storeScheemaInDB();
+ putModelToDatabase();
bool ok = db.commit();
if (db.lastError().type() == QSqlError::NoError) {
- q->databaseUpdated(last.versionMajor(), last.versionMinor(),
- current.versionMajor(), current.versionMinor());
- QString versionText = QString::number(current.versionMajor()) + "_"
- + QString::number(current.versionMinor());
+ q->databaseUpdated(last.version(), current.version());
for (int i = 0; i < q->metaObject()->methodCount(); i++) {
QMetaMethod m = q->metaObject()->method(i);
- if (m.name() == "update" + versionText) {
+ if (m.name() == "update" + current.version()) {
m.invoke(q, Qt::DirectConnection,
- Q_ARG(int, current.versionMajor()),
- Q_ARG(int, current.versionMinor()));
+ Q_ARG(QString, current.version()));
break;
}
}
@@ -162,6 +177,7 @@ bool DatabasePrivate::getCurrectScheema()
{
Q_Q(Database);
+ //is not first instanicate of this class
if (allTableMaps.contains(q->metaObject()->className())) {
currentModel = allTableMaps[q->metaObject()->className()];
return false;
@@ -170,7 +186,7 @@ bool DatabasePrivate::getCurrectScheema()
tables.clear();
// TODO: change logs must not be in model
- int changeLogTypeId = qRegisterMetaType();
+ int changeLogTypeId = qRegisterMetaType();
currentModel.append(
new TableModel(changeLogTypeId, __CHANGE_LOG_TABLE_NAME));
tables.insert(ChangeLogTable::staticMetaObject.className(),
@@ -179,19 +195,27 @@ bool DatabasePrivate::getCurrectScheema()
changeLogs = new TableSet(q);
for (int i = 0; i < q->metaObject()->classInfoCount(); i++) {
- QMetaClassInfo ci = q->metaObject()->classInfo(i);
- QString ciName
- = QString(ci.name()).replace(__nut_NAME_PERFIX, "").replace("\"",
- "");
- if (ciName.startsWith(__nut_TABLE))
- tables.insert(ciName.split(" ").at(1), ci.value());
+ QString type;
+ QString name;
+ QString value;
- if (ciName == __nut_DB_VERSION) {
+ if (!checkClassInfo(q->metaObject()->classInfo(i),
+ type, name, value)) {
+ continue;
+ }
+
+ if (type == __nut_TABLE)
+ tables.insert(name, value);
+
+ if (type == __nut_DB_VERSION)
+ currentModel.setVersion(name);
+
+ /* TODO: remove
QStringList version
= QString(ci.value()).replace("\"", "").split('.');
bool ok = false;
if (version.length() == 1) {
- currentModel.setVersionMajor(version.at(0).toInt(&ok));
+ currentModel.setVersion(version.at(0).toInt(&ok));
} else if (version.length() == 2) {
currentModel.setVersionMajor(version.at(0).toInt(&ok));
currentModel.setVersionMinor(version.at(1).toInt(&ok));
@@ -199,8 +223,7 @@ bool DatabasePrivate::getCurrectScheema()
if (!ok)
qFatal("NUT_DB_VERSION macro accept version in format 'x' or "
- "'x[.y]' only, and x,y must be integer values\n");
- }
+ "'x[.y]' only, and x,y must be integer values\n");*/
}
for (int i = 1; i < q->metaObject()->propertyCount(); i++) {
@@ -214,37 +237,52 @@ bool DatabasePrivate::getCurrectScheema()
}
}
- foreach (TableModel *sch, currentModel)
- foreach (RelationModel *fk, sch->foregionKeys())
- fk->table = currentModel.tableByClassName(fk->className);
+ foreach (TableModel *table, currentModel)
+ foreach (RelationModel *fk, table->foregionKeys())
+ fk->masterTable = currentModel.tableByClassName(fk->masterClassName);
allTableMaps.insert(q->metaObject()->className(), currentModel);
return true;
}
+bool DatabasePrivate::checkClassInfo(const QMetaClassInfo &classInfo, QString &type, QString &name, QString &value)
+{
+ if (!QString(classInfo.name()).startsWith(__nut_NAME_PERFIX)) {
+ return false;
+ } else {
+ QStringList parts = QString(classInfo.value()).split("\n");
+ if (parts.count() != 3)
+ return false;
+
+ type = parts[0];
+ name = parts[1];
+ value = parts[2];
+ return true;
+ }
+}
+
DatabaseModel DatabasePrivate::getLastScheema()
{
- Q_Q(Database);
-
ChangeLogTable *u = changeLogs->query()
->orderBy(!ChangeLogTable::idField())
->first();
- DatabaseModel ret(q->metaObject()->className());
+// DatabaseModel ret(q->metaObject()->className());
if (u) {
QJsonObject json
= QJsonDocument::fromJson(
QByteArray(u->data().toLocal8Bit().data())).object();
+ DatabaseModel ret = json;
+ return ret;
+ /*
foreach (QString key, json.keys()) {
TableModel *sch = new TableModel(json.value(key).toObject(), key);
ret.append(sch);
- }
-
- u->deleteLater();
+ }*/
}
- return ret;
+ return DatabaseModel();
// QSqlQuery query = q->exec("select * from __change_logs order by id
// desc limit 1");
@@ -262,7 +300,7 @@ DatabaseModel DatabasePrivate::getLastScheema()
// return ret;
}
-bool DatabasePrivate::storeScheemaInDB()
+bool DatabasePrivate::putModelToDatabase()
{
Q_Q(Database);
DatabaseModel current = currentModel;
@@ -270,8 +308,7 @@ bool DatabasePrivate::storeScheemaInDB()
ChangeLogTable *changeLog = new ChangeLogTable();
changeLog->setData(QJsonDocument(current.toJson()).toJson());
- changeLog->setVersionMajor(current.versionMajor());
- changeLog->setVersionMinor(current.versionMinor());
+ changeLog->setVersion(current.version());
changeLogs->append(changeLog);
q->saveChanges();
changeLog->deleteLater();
@@ -308,18 +345,33 @@ Database::Database(QObject *parent)
DatabasePrivate::lastId++;
}
-Database::Database(const Database &other, QObject *parent)
- : QObject(parent), d_ptr(new DatabasePrivate(this))
+Database::Database(const Database &other)
+ : QObject(other.parent()), d_ptr(new DatabasePrivate(this))
{
DatabasePrivate::lastId++;
setDriver(other.driver());
setHostName(other.hostName());
+ setPort(other.port());
setDatabaseName(other.databaseName());
setUserName(other.userName());
setPassword(other.password());
}
+Database::Database(const QSqlDatabase &other)
+{
+ //TODO: make a polish here
+ DatabasePrivate::lastId++;
+
+// setDriver(other.driver());
+ setHostName(other.hostName());
+ setPort(other.port());
+ setDatabaseName(other.databaseName());
+ setUserName(other.userName());
+ setPassword(other.password());
+ qRegisterMetaType();
+}
+
Database::~Database()
{
Q_D(Database);
@@ -443,16 +495,19 @@ SqlGeneratorBase *Database::sqlGenertor() const
return d->sqlGenertor;
}
-void Database::databaseUpdated(int oldMajor, int oldMinor, int newMajor,
- int newMinor)
+void Database::databaseUpdated(QString oldVersion, QString newVersion)
{
- Q_UNUSED(oldMajor);
- Q_UNUSED(oldMinor);
- Q_UNUSED(newMajor);
- Q_UNUSED(newMinor);
+ Q_UNUSED(oldVersion);
+ Q_UNUSED(newVersion);
}
+/**
+ * @brief Database::open
+ * Opens the database connection using the current connection values.
+ * Returns true on success; otherwise returns false.
+ * @return bool
+ */
bool Database::open()
{
return open(true);
diff --git a/src/database.h b/src/database.h
index 4166e69..455d491 100644
--- a/src/database.h
+++ b/src/database.h
@@ -44,7 +44,8 @@ class NUT_EXPORT Database : public QObject
public:
Database(QObject *parent = 0);
- Database(const Database &other, QObject *parent = 0);
+ Database(const Database &other);
+ Database(const QSqlDatabase &other);
~Database();
bool open();
@@ -71,8 +72,7 @@ public:
protected:
//remove minor version
- virtual void databaseUpdated(int oldMajor, int oldMinor, int newMajor,
- int newMinor);
+ virtual void databaseUpdated(QString oldVersion, QString newVersion);
public slots:
void setDatabaseName(QString databaseName);
diff --git a/src/database_p.h b/src/database_p.h
index 33c4b05..8265273 100644
--- a/src/database_p.h
+++ b/src/database_p.h
@@ -23,12 +23,12 @@
#include "database.h"
#include "databasemodel.h"
-#include "changelogtable.h"
#include
NUT_BEGIN_NAMESPACE
+class ChangeLogTable;
class DatabasePrivate
{
Database *q_ptr;
@@ -41,10 +41,12 @@ public:
bool updateDatabase();
void createChangeLogs();
- bool storeScheemaInDB();
+ bool putModelToDatabase();
DatabaseModel getLastScheema();
bool getCurrectScheema();
+ bool checkClassInfo(const QMetaClassInfo &classInfo,
+ QString &type, QString &name, QString &value);
QSqlDatabase db;
QString hostName;
@@ -63,9 +65,11 @@ public:
QT_DEPRECATED
QHash tables;
static QMap allTableMaps;
- static int lastId;
+ static qulonglong lastId;
QSet tableSets;
+
+ bool isDatabaseNew;
};
NUT_END_NAMESPACE
diff --git a/src/databasemodel.cpp b/src/databasemodel.cpp
index 3cea9da..e5adc6d 100644
--- a/src/databasemodel.cpp
+++ b/src/databasemodel.cpp
@@ -21,22 +21,42 @@
#include "databasemodel.h"
#include "tablemodel.h"
+#include
#include
NUT_BEGIN_NAMESPACE
QMap DatabaseModel::_models;
-DatabaseModel::DatabaseModel(const QString &name) : QList(), _databaseClassName(name), _versionMajor(0), _versionMinor(0)
+#define NODE_VERSION "version"
+#define NODE_TABLES "tables"
+DatabaseModel::DatabaseModel(const QString &name) :
+ QList(), _databaseClassName(name), _version(QString::null)
{
_models.insert(name, this);
}
-DatabaseModel::DatabaseModel(const DatabaseModel &other) : QList(other), _versionMajor(0), _versionMinor(0)
+DatabaseModel::DatabaseModel(const DatabaseModel &other) :
+ QList(other), _version(QString::null)
{
}
+DatabaseModel::DatabaseModel(const QJsonObject &json) :
+ QList()
+{
+ setVersion(json.value(NODE_VERSION).toString());
+
+ QJsonObject tables = json.value(NODE_TABLES).toObject();
+ foreach (QString key, tables.keys()) {
+ if(!tables.value(key).isObject())
+ continue;
+
+ TableModel *sch = new TableModel(tables.value(key).toObject(), key);
+ append(sch);
+ }
+}
+
TableModel *DatabaseModel::tableByName(QString tableName) const
{
for(int i = 0; i < size(); i++){
@@ -46,23 +66,22 @@ TableModel *DatabaseModel::tableByName(QString tableName) const
return s;
}
- qWarning("Table with name '%s' not found in model",
- qUtf8Printable(tableName));
+// qWarning("Table with name '%s' not found in model",
+// qUtf8Printable(tableName));
return 0;
}
TableModel *DatabaseModel::tableByClassName(QString className) const
{
+ QStringList l;
for(int i = 0; i < size(); i++){
TableModel *s = at(i);
+ l.append(s->className());
if(s->className() == className)
return s;
}
- qWarning("Table with class name '%s' not found in model",
- qUtf8Printable(className));
-// Q_UNREACHABLE();
return 0;
}
@@ -85,21 +104,41 @@ bool DatabaseModel::operator ==(const DatabaseModel &other) const
return true;
}
+DatabaseModel DatabaseModel::operator +(const DatabaseModel &other)
+{
+ DatabaseModel model;
+ DatabaseModel::const_iterator i;
+
+ for (i = constBegin(); i != constEnd(); ++i)
+ model.append(*i);
+
+ for (i = other.constBegin(); i != other.constEnd(); ++i)
+ model.append(*i);
+
+ return model;
+}
+
QJsonObject DatabaseModel::toJson() const
{
QJsonObject obj;
-// obj.insert(QT_STRINGIFY(versionMajor), QJsonValue(_versionMajor));
-// obj.insert(QT_STRINGIFY(versionMinor), QJsonValue(_versionMinor));
-
+ obj.insert(NODE_VERSION, QJsonValue(_version));
+ QJsonObject tables;
for(int i = 0; i < size(); i++){
TableModel *s = at(i);
- obj.insert(s->name(), s->toJson());
+ tables.insert(s->name(), s->toJson());
}
+ obj.insert(NODE_TABLES, tables);
+
return obj;
}
+DatabaseModel::operator QJsonObject()
+{
+ return toJson();
+}
+
RelationModel *DatabaseModel::relationByClassNames(const QString &masterClassName, const QString &childClassName)
{
TableModel *childTable = tableByClassName(childClassName);
@@ -108,7 +147,7 @@ RelationModel *DatabaseModel::relationByClassNames(const QString &masterClassNam
return 0;
foreach (RelationModel *rel, childTable->foregionKeys())
- if(rel->className == masterClassName)
+ if(rel->masterClassName == masterClassName)
return rel;
return 0;
@@ -122,7 +161,7 @@ RelationModel *DatabaseModel::relationByTableNames(const QString &masterTableNam
return 0;
foreach (RelationModel *rel, childTable->foregionKeys())
- if(rel->table->name() == masterTableName)
+ if(rel->masterTable->name() == masterTableName)
return rel;
return 0;
@@ -132,10 +171,10 @@ DatabaseModel DatabaseModel::fromJson(QJsonObject &json)
{
DatabaseModel model(QString::null);
-// model.setVersionMajor(json.value(QT_STRINGIFY(versionMajor)).toInt());
-// model.setVersionMinor(json.value(QT_STRINGIFY(versionMinor)).toInt());
+ model.setVersion(json.value(NODE_VERSION).toString());
- foreach (QString key, json.keys()) {
+ QJsonObject tables = json.value(NODE_TABLES).toObject();
+ foreach (QString key, tables.keys()) {
if(!json.value(key).isObject())
continue;
@@ -145,24 +184,14 @@ DatabaseModel DatabaseModel::fromJson(QJsonObject &json)
return model;
}
-int DatabaseModel::versionMajor() const
+QString DatabaseModel::version() const
{
- return _versionMajor;
+ return _version;
}
-void DatabaseModel::setVersionMajor(int versionMajor)
+void DatabaseModel::setVersion(QString version)
{
- _versionMajor = versionMajor;
-}
-
-int DatabaseModel::versionMinor() const
-{
- return _versionMinor;
-}
-
-void DatabaseModel::setVersionMinor(int versionMinor)
-{
- _versionMinor = versionMinor;
+ _version = version;
}
bool DatabaseModel::remove(const QString &tableName)
@@ -177,6 +206,15 @@ bool DatabaseModel::remove(const QString &tableName)
return false;
}
+void DatabaseModel::fixRelations()
+{
+ /*TODO: fixme
+ foreach (TableModel *table, currentModel)
+ foreach (RelationModel *fk, table->foregionKeys())
+ fk->masterTable = currentModel.tableByClassName(fk->masterClassName);
+ */
+}
+
DatabaseModel *DatabaseModel::modelByName(const QString &name)
{
if (_models.contains(name))
diff --git a/src/databasemodel.h b/src/databasemodel.h
index 8a57f7d..c4e25b8 100644
--- a/src/databasemodel.h
+++ b/src/databasemodel.h
@@ -22,6 +22,9 @@
#define DATABASEMODEL_H
#include
+#include
+#include
+
#include "defines.h"
class QJsonObject;
@@ -33,12 +36,13 @@ struct RelationModel;
class DatabaseModel : public QList
{
QString _databaseClassName;
- int _versionMajor, _versionMinor;
+ QString _version;
static QMap _models;
public:
DatabaseModel(const QString &name = QString::null);
DatabaseModel(const DatabaseModel &other);
+ DatabaseModel(const QJsonObject &json);
TableModel *tableByName(QString tableName) const;
TableModel *tableByClassName(QString className) const;
@@ -49,18 +53,21 @@ public:
const QString &childClassName);
bool operator==(const DatabaseModel &other) const;
+ DatabaseModel operator +(const DatabaseModel &other);
+ Q_DECL_DEPRECATED
static DatabaseModel fromJson(QJsonObject &json);
QJsonObject toJson() const;
+ operator QJsonObject();
- int versionMajor() const;
- void setVersionMajor(int versionMajor);
-
- int versionMinor() const;
- void setVersionMinor(int versionMinor);
+ QString version() const;
+ void setVersion(QString version);
bool remove(const QString &tableName);
+ //TODO: may be private (called from DatabasePrivate::getCurrectScheema only)
+ void fixRelations();
+
static DatabaseModel *modelByName(const QString &name);
};
diff --git a/src/defines.h b/src/defines.h
index 5dc0b89..b8f4f89 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -26,43 +26,34 @@
#include "defines_p.h"
#include "qglobal.h"
-
#ifdef NUT_COMPILE_STATIC
# define NUT_EXPORT
#else
# define NUT_EXPORT Q_DECL_EXPORT
#endif
-
-#ifdef NUT_NAMESPACE
-//TODO: remove unused macro
-# define __NUT_NAMESPACE_PERFIX NUT_NAMESPACE::
-# define NUT_WRAP_NAMESPACE(x) NUT_NAMESPACE::x
-#else
-//TODO: remove unused macro
-# define __NUT_NAMESPACE_PERFIX
-# define NUT_WRAP_NAMESPACE(x) x
-#endif
+#define NUT_INFO(type, name, value) \
+ Q_CLASSINFO(__nut_NAME_PERFIX type #name #value, type "\n" #name "\n" #value)
// Database
-//TODO: remove minor version
-#define NUT_DB_VERSION(major, minor) Q_CLASSINFO(QT_STRINGIFY(__nut_NAME_PERFIX __nut_DB_VERSION), QT_STRINGIFY(#major "." #minor))
+#define NUT_DB_VERSION(version) \
+ NUT_INFO(__nut_DB_VERSION, version, 0)
#define NUT_DECLARE_TABLE(type, name) \
- Q_CLASSINFO(QT_STRINGIFY(__nut_NAME_PERFIX __nut_TABLE " " #type), #name) \
+ NUT_INFO(__nut_TABLE, type, name) \
Q_PROPERTY(type* name READ name) \
- Q_PROPERTY(NUT_WRAP_NAMESPACE(TableSet) name##s READ name##s) \
+ Q_PROPERTY(NUT_WRAP_NAMESPACE(TableSet) name##Table READ name##Table) \
type* m_##name; \
- NUT_WRAP_NAMESPACE(TableSet) *m_##name##s; \
+ NUT_WRAP_NAMESPACE(TableSet) *m_##name##Table; \
public: \
static const type _##name; \
type* name() const{ return m_##name; } \
- NUT_WRAP_NAMESPACE(TableSet) *name##s() const { return m_##name##s; }
+ NUT_WRAP_NAMESPACE(TableSet) *name##Table() const { return m_##name##Table; }
//Table
#define NUT_DECLARE_FIELD(type, name, read, write) \
Q_PROPERTY(type name READ read WRITE write) \
- Q_CLASSINFO(QT_STRINGIFY(__nut_NAME_PERFIX #name " " __nut_FIELD), #name) \
+ NUT_INFO(__nut_FIELD, name, 0) \
type m_##name; \
public: \
static NUT_WRAP_NAMESPACE(FieldPhrase) name ## Field(){ \
@@ -80,7 +71,7 @@ public: \
#define NUT_FOREGION_KEY(type, keytype, name, read, write) \
Q_PROPERTY(type* name READ read WRITE write) \
NUT_DECLARE_FIELD(keytype, name##Id, read##Id, write##Id) \
- Q_CLASSINFO(QT_STRINGIFY(__nut_NAME_PERFIX #name "Id " __nut_FOREGION_KEY), #type) \
+ NUT_INFO(__nut_FOREGION_KEY, name, type) \
type *m_##name; \
public: \
type *read() const { return m_##name ; } \
@@ -92,38 +83,27 @@ public: \
private: \
NUT_WRAP_NAMESPACE(TableSet) *m_##n; \
public: \
- static type *n##Table(){ \
- static type *f = new type(); \
- return f; \
- } \
- NUT_WRAP_NAMESPACE(TableSet) *n(){ \
- return m_##n; \
- }
+ static type *n##Table(); \
+ NUT_WRAP_NAMESPACE(TableSet) *n();
+
+#define NUT_IMPLEMENT_CHILD_TABLE(class, type, n) \
+ type *class::n##Table(){ \
+ static type *f = new type(); \
+ return f; \
+ } \
+ NUT_WRAP_NAMESPACE(TableSet) *class::n(){ \
+ return m_##n; \
+ }
+#define NUT_PRIMARY_KEY(x) NUT_INFO(__nut_PRIMARY_KEY, x, 0)
+#define NUT_AUTO_INCREMENT(x) NUT_INFO(__nut_AUTO_INCREMENT, x, 0)
+#define NUT_PRIMARY_AUTO_INCREMENT(x) NUT_PRIMARY_KEY(x) \
+ NUT_AUTO_INCREMENT(x)
+#define NUT_UNIQUE(x) NUT_INFO(__nut_UNIQUE, x, 0)
+#define NUT_LEN(field, len) NUT_INFO(__nut_LEN, field, len)
+#define NUT_DEFAULT_VALUE(x, n) NUT_INFO(__nut_DEFAULT_VALUE, x, n)
+#define NUT_NOT_NULL(x) NUT_INFO(__nut_NOT_NULL, x, 1)
#define NUT_INDEX(name, field, order)
-#define NUT_PRIMARY_KEY(x) Q_CLASSINFO(QT_STRINGIFY(__nut_NAME_PERFIX #x " " __nut_PRIMARY_KEY), #x)
-#define NUT_AUTO_INCREMENT(x) Q_CLASSINFO(QT_STRINGIFY(__nut_NAME_PERFIX #x " " __nut_AUTO_INCREMENT), #x)
-#define NUT_PRIMARY_AUTO_INCREMENT(x) NUT_PRIMARY_KEY(x) \
- NUT_AUTO_INCREMENT(x)
-#define NUT_UNIQUE(x) Q_CLASSINFO(QT_STRINGIFY(__nut_NAME_PERFIX #x " " __nut_UNIQUE), #x)
-#define NUT_LEN(field, len) Q_CLASSINFO(QT_STRINGIFY(__nut_NAME_PERFIX #field " " __nut_LEN), #len)
-#define NUT_DEFAULT_VALUE(x, n) Q_CLASSINFO(QT_STRINGIFY(__nut_NAME_PERFIX #x " " __nut_DEFAULT_VALUE), #n)
-#define NUT_NOT_NULL(x) Q_CLASSINFO(QT_STRINGIFY(__nut_NAME_PERFIX #x " " __nut_NOT_NULL), "1")
-
-#ifndef NUT_NO_KEYWORDS
-# define FROM(x) (x->query())
-# define WHERE(x) ->setWhere(x)
-# define JOIN(x) ->join(#x)
-# define ORDERBY(x) ->orderBy(#x);
-# define ORDERBY_DESC(x) ->orderBy(!#x);
-
-# define SELECT() ->toList()
-# define COUNT() ->count()
-# define DELETE() ->remove()
-# define FIRST() ->first()
-#endif // NUT_NO_KEYWORDS
-
-
#endif // SYNTAX_DEFINES_H
diff --git a/src/defines_p.h b/src/defines_p.h
index 425d02c..4c9bea2 100644
--- a/src/defines_p.h
+++ b/src/defines_p.h
@@ -44,11 +44,13 @@
#define __nut_CHANGE "change"
#ifdef NUT_NAMESPACE
-# define NUT_BEGIN_NAMESPACE namespace NUT_NAMESPACE{
-# define NUT_END_NAMESPACE }
+# define NUT_BEGIN_NAMESPACE namespace NUT_NAMESPACE{
+# define NUT_END_NAMESPACE }
+# define NUT_WRAP_NAMESPACE(x) NUT_NAMESPACE::x
#else
# define NUT_BEGIN_NAMESPACE
# define NUT_END_NAMESPACE
+# define NUT_WRAP_NAMESPACE(x) x
#endif
#endif // DEFINES_P_H
diff --git a/src/mysqlgenerator.cpp b/src/generators/mysqlgenerator.cpp
similarity index 78%
rename from src/mysqlgenerator.cpp
rename to src/generators/mysqlgenerator.cpp
index f2d4c1a..559e392 100644
--- a/src/mysqlgenerator.cpp
+++ b/src/generators/mysqlgenerator.cpp
@@ -19,7 +19,7 @@
**************************************************************************/
#include "mysqlgenerator.h"
-#include "tablemodel.h"
+#include "../tablemodel.h"
#include
#include
@@ -134,4 +134,24 @@ QString MySqlGenerator::phrase(const PhraseData *d) const
return SqlGeneratorBase::phrase(d);
}
+QString MySqlGenerator::selectCommand(SqlGeneratorBase::AgregateType t,
+ QString agregateArg,
+ QString tableName,
+ QList &wheres,
+ QList &orders,
+ QList joins,
+ int skip, int take)
+{
+ QString command = SqlGeneratorBase::selectCommand(t, agregateArg,
+ tableName,
+ wheres, orders,
+ joins, skip, take);
+
+ if (take != -1 && skip != -1)
+ command.append(QString(" LIMIT %1 OFFSET %2")
+ .arg(take)
+ .arg(skip));
+ return command;
+}
+
NUT_END_NAMESPACE
diff --git a/src/mysqlgenerator.h b/src/generators/mysqlgenerator.h
similarity index 87%
rename from src/mysqlgenerator.h
rename to src/generators/mysqlgenerator.h
index 8243ada..bf4ec6f 100644
--- a/src/mysqlgenerator.h
+++ b/src/generators/mysqlgenerator.h
@@ -35,6 +35,7 @@ public:
QString escapeValue(const QVariant &v) const;
QVariant readValue(const QVariant::Type &type, const QVariant &dbValue);
QString phrase(const PhraseData *d) const;
+ QString selectCommand(AgregateType t, QString agregateArg, QString tableName, QList &wheres, QList &orders, QList joins, int skip, int take);
};
NUT_END_NAMESPACE
diff --git a/src/postgresqlgenerator.cpp b/src/generators/postgresqlgenerator.cpp
similarity index 98%
rename from src/postgresqlgenerator.cpp
rename to src/generators/postgresqlgenerator.cpp
index 0ff4b46..105e663 100644
--- a/src/postgresqlgenerator.cpp
+++ b/src/generators/postgresqlgenerator.cpp
@@ -19,8 +19,8 @@
**************************************************************************/
#include "postgresqlgenerator.h"
-#include "table.h"
-#include "tablemodel.h"
+#include "../table.h"
+#include "../tablemodel.h"
NUT_BEGIN_NAMESPACE
diff --git a/src/postgresqlgenerator.h b/src/generators/postgresqlgenerator.h
similarity index 100%
rename from src/postgresqlgenerator.h
rename to src/generators/postgresqlgenerator.h
diff --git a/src/sqlgeneratorbase.cpp b/src/generators/sqlgeneratorbase.cpp
similarity index 70%
rename from src/sqlgeneratorbase.cpp
rename to src/generators/sqlgeneratorbase.cpp
index fa1c0cb..3a7b88f 100644
--- a/src/sqlgeneratorbase.cpp
+++ b/src/generators/sqlgeneratorbase.cpp
@@ -19,20 +19,39 @@
**************************************************************************/
#include
+#include
#include
#include
#include
+#include
#include
-#include "database.h"
-#include "databasemodel.h"
#include "sqlgeneratorbase_p.h"
-#include "table.h"
-#include "tablemodel.h"
-#include "wherephrase.h"
+#include "../database.h"
+#include "../table.h"
+#include "../databasemodel.h"
+#include "../tablemodel.h"
+#include "../wherephrase.h"
NUT_BEGIN_NAMESPACE
+/*
+ * Index:
+ * ALTER TABLE `travelLog` ADD INDEX(`driverId`);
+ *
+ * Foreign key:
+ * ALTER TABLE `travelLog`
+ * ADD CONSTRAINT `travelLog_ibfk_1`
+ * FOREIGN KEY (`driverId`)
+ * REFERENCES `account` (`id`)
+ * ON DELETE CASCADE
+ * ON UPDATE CASCADE;
+ *
+ * SELECT
+ * FROM dbo.GiftTypes
+ * INNER JOIN dbo.GiftCards ON dbo.GiftTypes.GiftTypeID = dbo.GiftCards.GiftTypeID
+ * INNER JOIN dbo.Entities ON dbo.GiftCards.GiftCardID = dbo.Entities.GiftCardID
+ */
SqlGeneratorBase::SqlGeneratorBase(Database *parent)
: QObject((QObject *)parent)
{
@@ -50,6 +69,12 @@ QString SqlGeneratorBase::masterDatabaseName(QString databaseName)
return "";
}
+QString SqlGeneratorBase::createTable(TableModel *table)
+{
+ Q_UNUSED(table);
+ return "";
+}
+
QString SqlGeneratorBase::saveRecord(Table *t, QString tableName)
{
Q_ASSERT(!tableName.isEmpty() && !tableName.isNull());
@@ -71,6 +96,20 @@ QString SqlGeneratorBase::saveRecord(Table *t, QString tableName)
return "";
}
+QString SqlGeneratorBase::recordsPhrase(TableModel *table)
+{
+ if (!table)
+ return "";
+
+ QString ret = "";
+ foreach (FieldModel *f, table->fields()) {
+ if (!ret.isEmpty())
+ ret.append(", ");
+ ret.append(QString("%1.%2 AS [%1.%2]").arg(table->name()).arg(f->name));
+ }
+ return ret;
+}
+
QString SqlGeneratorBase::fieldDeclare(FieldModel *field)
{
return field->name + " " + fieldType(field) + (field->notNull ? " NOT NULL" : "");
@@ -81,18 +120,15 @@ QStringList SqlGeneratorBase::diff(DatabaseModel lastModel,
{
QStringList ret;
- QSet tableNames;
- foreach (TableModel *table, lastModel)
- tableNames.insert(table->name());
+ DatabaseModel unionModel = lastModel + newModel;
- foreach (TableModel *table, newModel)
- tableNames.insert(table->name());
-
- foreach (QString tableName, tableNames) {
- TableModel *oldTable = lastModel.tableByName(tableName);
- TableModel *newTable = newModel.tableByName(tableName);
+ foreach (TableModel *table, unionModel) {
+ TableModel *oldTable = lastModel.tableByName(table->name());
+ TableModel *newTable = newModel.tableByName(table->name());
QString sql = diff(oldTable, newTable);
- ret << sql;
+
+ if (!sql.isEmpty())
+ ret << sql;
}
return ret;
@@ -164,6 +200,98 @@ QString SqlGeneratorBase::diff(TableModel *oldTable, TableModel *newTable)
return sql;
}
+QString SqlGeneratorBase::join(const QString &mainTable,
+ const QList list,
+ QStringList *order)
+{
+ QString ret = mainTable;
+ QList::const_iterator i;
+ for (i = list.begin(); i != list.end(); ++i) {
+ if ((*i)->masterTable->name() == mainTable) {
+ ret.append(QString(" INNER JOIN %3 ON %1.%2 = %3.%4")
+ .arg((*i)->masterTable->name())
+ .arg((*i)->masterTable->primaryKey())
+ .arg((*i)->slaveTable->name())
+ .arg((*i)->localColumn));
+
+ if (order != Q_NULLPTR)
+ order->append((*i)->slaveTable->name() + "." + (*i)->slaveTable->primaryKey());
+ } else {
+ ret.append(QString(" INNER JOIN %3 ON %1.%2 = %3.%4")
+ .arg(mainTable)
+ .arg((*i)->localColumn)
+ .arg((*i)->masterTable->name())
+ .arg((*i)->masterTable->primaryKey()));
+
+ if (order != Q_NULLPTR)
+ order->append((*i)->masterTable->name() + "." + (*i)->masterTable->primaryKey());
+ }
+ }
+ return ret;
+}
+
+QString SqlGeneratorBase::join(const QStringList &list, QStringList *order)
+{
+ //TODO: reorder list first!
+ //TODO: make this ungly code better and bugless :-)
+ /*
+ * Known issues:
+ * Support onle near joins, far supports with medium table finding not support yet
+ */
+
+ if (!list.count())
+ return "";
+
+ if (list.count() == 1)
+ return "[" + list.first() + "]";
+
+ DatabaseModel model = _database->model();
+ QStringList clone = list;
+ QString mainTable = clone.takeFirst();
+ QString ret = "[" + mainTable + "]";
+
+ do {
+ if (!clone.count())
+ break;
+
+ QString table = clone.first();// model.tableByClassName(clone.first())->name();
+ RelationModel *rel = model.relationByClassNames(mainTable, clone.first());
+ if (rel) {
+ //mainTable is master of table
+ ret.append(QString(" INNER JOIN [%1] ON %4.%2 = %1.%3")
+ .arg(table)
+ .arg(rel->masterTable->primaryKey())
+ .arg(rel->localColumn)
+ .arg(mainTable));
+
+ if (order != Q_NULLPTR)
+ order->append(mainTable + "." + rel->masterTable->primaryKey());
+
+ } else{
+ rel = model.relationByClassNames(clone.first(), mainTable);
+ if (rel) {
+ // table is master of mainTable
+ ret.append(QString(" INNER JOIN [%1] ON %4.%2 = %1.%3")
+ .arg(table)
+ .arg(rel->localColumn)
+ .arg(rel->masterTable->primaryKey())
+ .arg(mainTable));
+
+ if (order != Q_NULLPTR)
+ order->append(mainTable + "." + rel->localColumn);
+
+ } else {
+// qInfo("Relation for %s and %s not exists",
+// qPrintable(table), qPrintable(mainTable));
+ }
+ }
+
+ clone.takeFirst();
+ } while (clone.count());
+
+ return ret;
+}
+
QString SqlGeneratorBase::insertRecord(Table *t, QString tableName)
{
QString sql = "";
@@ -274,14 +402,10 @@ QString SqlGeneratorBase::fromTableText(const QString &tableName,
.arg(rel->localColumn);
orderBy = tableName + "." + pk;
} else {
- qWarning(
- QString(
- "Relation between table %1 and class %2 (%3) not exists!")
- .arg(tableName)
- .arg(joinClassName)
- .arg(joinTableName.isNull() ? "NULL" : joinTableName)
- .toLatin1()
- .data());
+ qWarning("Relation between table %s and class %s (%s) not exists!",
+ qPrintable(tableName),
+ qPrintable(joinClassName),
+ qPrintable(joinTableName.isNull() ? "NULL" : joinTableName));
joinClassName = QString::null;
}
}
@@ -304,23 +428,40 @@ QString SqlGeneratorBase::deleteRecords(QString tableName, QString where)
QString SqlGeneratorBase::selectCommand(SqlGeneratorBase::AgregateType t,
QString agregateArg,
+ QString tableName,
QList &wheres,
QList &orders,
- QString tableName,
- QString joinClassName, int skip, int take)
+ QList joins,
+ int skip, int take)
{
Q_UNUSED(take);
Q_UNUSED(skip);
+ QStringList joinedOrders;
QString select = agregateText(t, agregateArg);
+
+ //TODO: temporatory disabled
+ if (t == SelectAll) {
+ QSet tables;
+ tables.insert(_database->model().tableByName(tableName));
+ foreach (RelationModel *rel, joins)
+ tables << rel->masterTable << rel->slaveTable;
+
+ select = "";
+ foreach (TableModel *t, tables) {
+ if (!select.isEmpty())
+ select.append(", ");
+ select.append(recordsPhrase(t));
+ }
+ }
+ QString from = join(tableName, joins, &joinedOrders);
QString where = createWhere(wheres);
- QString order = "";
- QString from = fromTableText(tableName, joinClassName, order);
+ QString orderText = joinedOrders.join(", ");
foreach (WherePhrase p, orders) {
- if (order != "")
- order.append(", ");
- order.append(phraseOrder(p.data()));
+ if (orderText != "")
+ orderText.append(", ");
+ orderText.append(phraseOrder(p.data()));
}
QString sql = "SELECT " + select + " FROM " + from;
@@ -328,8 +469,8 @@ QString SqlGeneratorBase::selectCommand(SqlGeneratorBase::AgregateType t,
if (where != "")
sql.append(" WHERE " + where);
- if (order != "")
- sql.append(" ORDER BY " + order);
+ if (orderText != "")
+ sql.append(" ORDER BY " + orderText);
for (int i = 0; i < _database->model().count(); i++)
sql = sql.replace(_database->model().at(i)->className() + ".",
@@ -337,7 +478,7 @@ QString SqlGeneratorBase::selectCommand(SqlGeneratorBase::AgregateType t,
replaceTableNames(sql);
- return sql;
+ return sql + " ";
}
QString SqlGeneratorBase::createWhere(QList &wheres)
@@ -357,7 +498,8 @@ QString SqlGeneratorBase::createWhere(QList &wheres)
void SqlGeneratorBase::replaceTableNames(QString &command)
{
foreach (TableModel *m, TableModel::allModels())
- command = command.replace("[" + m->className() + "].", "`" + m->name() + "`.");
+ command = command
+ .replace("[" + m->className() + "]", "`" + m->name() + "`");
}
void SqlGeneratorBase::removeTableNames(QString &command)
@@ -405,14 +547,6 @@ QString SqlGeneratorBase::updateCommand(WherePhrase &phrase,
return sql;
}
-QString SqlGeneratorBase::joinTables(QStringList tables)
-{
- Q_UNUSED(tables);
- //TODO: implement me
-// _database->model().relationByClassNames()
- return "";
-}
-
QString SqlGeneratorBase::escapeValue(const QVariant &v) const
{
switch (v.type()) {
@@ -428,18 +562,22 @@ QString SqlGeneratorBase::escapeValue(const QVariant &v) const
return v.toString();
break;
+ case QVariant::Uuid:
+ return v.toUuid().toString();
+ break;
+
case QVariant::Char:
case QVariant::String:
return "'" + v.toString() + "'";
case QVariant::DateTime:
- return "'" + v.toDateTime().toString() + "'";
+ return "'" + v.toDateTime().toString(Qt::ISODate) + "'";
case QVariant::Date:
- return "'" + v.toDate().toString() + "'";
+ return "'" + v.toDate().toString(Qt::ISODate) + "'";
case QVariant::Time:
- return "'" + v.toTime().toString() + "'";
+ return "'" + v.toTime().toString(Qt::ISODate) + "'";
case QVariant::StringList:
case QVariant::List:
@@ -460,6 +598,7 @@ QString SqlGeneratorBase::escapeValue(const QVariant &v) const
return "";
default:
+ Q_UNREACHABLE();
return "";
}
}
diff --git a/src/sqlgeneratorbase_p.h b/src/generators/sqlgeneratorbase_p.h
similarity index 86%
rename from src/sqlgeneratorbase_p.h
rename to src/generators/sqlgeneratorbase_p.h
index 9714948..011f6b1 100644
--- a/src/sqlgeneratorbase_p.h
+++ b/src/generators/sqlgeneratorbase_p.h
@@ -24,7 +24,7 @@
#include
#include
#include
-#include "wherephrase.h"
+#include "../wherephrase.h"
NUT_BEGIN_NAMESPACE
@@ -33,8 +33,7 @@ struct FieldModel;
class DatabaseModel;
class TableModel;
class Database;
-//struct PhraseData;
-//class WherePhrase;
+class RelationModel;
class SqlGeneratorBase : public QObject
{
// Q_OBJECT
@@ -61,6 +60,8 @@ public:
virtual QString masterDatabaseName(QString databaseName);
+ virtual QString createTable(TableModel *table);
+
virtual QString fieldType(FieldModel *field) = 0;
virtual QString fieldDeclare(FieldModel *field);
@@ -68,28 +69,31 @@ public:
virtual QString diff(FieldModel *oldField, FieldModel *newField);
virtual QString diff(TableModel *oldTable, TableModel *newTable);
+ virtual QString join(const QString &mainTable,
+ const QList list,
+ QStringList *order = Q_NULLPTR);
+ virtual QString join(const QStringList &list, QStringList *order = Q_NULLPTR);
+
virtual QString saveRecord(Table *t, QString tableName);
+
+ virtual QString recordsPhrase(TableModel *table);
+
virtual QString insertRecord(Table *t, QString tableName);
virtual QString updateRecord(Table *t, QString tableName);
virtual QString deleteRecord(Table *t, QString tableName);
-
-
virtual QString deleteRecords(QString tableName, QString where);
virtual QString selectCommand(AgregateType t,
- QString agregateArg,
+ QString agregateArg, QString tableName,
QList &wheres,
QList &orders,
- QString tableName,
- QString joinClassName,
+ QList joins,
int skip = -1, int take = -1);
virtual QString deleteCommand(QList &wheres, QString tableName);
virtual QString updateCommand(WherePhrase &phrase, QList &wheres, QString tableName);
- virtual QString joinTables(QStringList tables);
-
virtual QString escapeValue(const QVariant &v) const;
virtual QVariant readValue(const QVariant::Type &type, const QVariant &dbValue);
virtual QString phrase(const PhraseData *d) const;
diff --git a/src/sqlitegenerator.cpp b/src/generators/sqlitegenerator.cpp
similarity index 62%
rename from src/sqlitegenerator.cpp
rename to src/generators/sqlitegenerator.cpp
index 744bb27..bddd186 100644
--- a/src/sqlitegenerator.cpp
+++ b/src/generators/sqlitegenerator.cpp
@@ -19,8 +19,8 @@
**************************************************************************/
#include "sqlitegenerator.h"
-#include "table.h"
-#include "tablemodel.h"
+#include "../table.h"
+#include "../tablemodel.h"
NUT_BEGIN_NAMESPACE
@@ -54,10 +54,9 @@ QString SqliteGenerator::fieldType(FieldModel *field)
dbType = "real";
break;
case QVariant::Int:
-// if(field->isPrimaryKey)
-// dbType = "INTEGER PRIMARY KEY";
-// else
- dbType = "integer";
+ dbType = "integer";
+// if (field->isAutoIncrement)
+// dbType.append(" PRIMARY KEY AUTOINCREMENT");
break;
case QVariant::String:
if(field->length)
@@ -72,4 +71,24 @@ QString SqliteGenerator::fieldType(FieldModel *field)
return dbType;
}
+QString SqliteGenerator::selectCommand(SqlGeneratorBase::AgregateType t,
+ QString agregateArg,
+ QString tableName,
+ QList &wheres,
+ QList &orders,
+ QList joins,
+ int skip, int take)
+{
+ QString command = SqlGeneratorBase::selectCommand(t, agregateArg,
+ tableName,
+ wheres, orders,
+ joins, skip, take);
+
+ if (take != -1 && skip != -1)
+ command.append(QString(" LIMIT %1 OFFSET %2")
+ .arg(take)
+ .arg(skip));
+ return command;
+}
+
NUT_END_NAMESPACE
diff --git a/src/sqlitegenerator.h b/src/generators/sqlitegenerator.h
similarity index 80%
rename from src/sqlitegenerator.h
rename to src/generators/sqlitegenerator.h
index d607e0e..eeefffa 100644
--- a/src/sqlitegenerator.h
+++ b/src/generators/sqlitegenerator.h
@@ -32,6 +32,12 @@ public:
SqliteGenerator(Database *parent = 0);
QString fieldType(FieldModel *field);
+
+ QString selectCommand(AgregateType t, QString agregateArg,
+ QString tableName,
+ QList &wheres,
+ QList &orders,
+ QList joins, int skip, int take);
};
NUT_END_NAMESPACE
diff --git a/src/sqlservergenerator.cpp b/src/generators/sqlservergenerator.cpp
similarity index 83%
rename from src/sqlservergenerator.cpp
rename to src/generators/sqlservergenerator.cpp
index cdca934..d1c5b3c 100644
--- a/src/sqlservergenerator.cpp
+++ b/src/generators/sqlservergenerator.cpp
@@ -19,8 +19,8 @@
**************************************************************************/
#include "sqlservergenerator.h"
-#include "table.h"
-#include "tablemodel.h"
+#include "../table.h"
+#include "../tablemodel.h"
#include
#include
@@ -133,15 +133,20 @@ QString SqlServerGenerator::escapeValue(const QVariant &v) const
return SqlGeneratorBase::escapeValue(v);
}
-QString SqlServerGenerator::selectCommand(
- SqlGeneratorBase::AgregateType t, QString agregateArg,
- QList &wheres, QList &orders, QString tableName,
- QString joinClassName, int skip, int take)
+QString SqlServerGenerator::selectCommand(SqlGeneratorBase::AgregateType t,
+ QString agregateArg,
+ QString tableName,
+ QList &wheres,
+ QList &orders,
+ QList joins, int skip, int take)
{
- QString command = SqlGeneratorBase::selectCommand(t, agregateArg, wheres, orders, tableName, joinClassName, skip, take);
+ QString command = SqlGeneratorBase::selectCommand(t, agregateArg,
+ tableName,
+ wheres, orders,
+ joins, skip, take);
if (take != -1 && skip != -1)
- command.append(QString("OFFSET 10 ROWS FETCH NEXT 10 ROWS ONLY")
+ command.append(QString("OFFSET %1 ROWS FETCH NEXT %2 ROWS ONLY")
.arg(skip)
.arg(take));
return command;
diff --git a/src/sqlservergenerator.h b/src/generators/sqlservergenerator.h
similarity index 89%
rename from src/sqlservergenerator.h
rename to src/generators/sqlservergenerator.h
index 0966b27..9368050 100644
--- a/src/sqlservergenerator.h
+++ b/src/generators/sqlservergenerator.h
@@ -39,9 +39,10 @@ public:
QString escapeValue(const QVariant &v) const;
QString selectCommand(AgregateType t, QString agregateArg,
+ QString tableName,
QList &wheres,
- QList &orders, QString tableName,
- QString joinClassName, int skip, int take);
+ QList &orders,
+ QList joins, int skip, int take);
};
NUT_END_NAMESPACE
diff --git a/src/query.cpp b/src/query.cpp
index 9fc86ca..eacf1ba 100644
--- a/src/query.cpp
+++ b/src/query.cpp
@@ -23,7 +23,7 @@
NUT_BEGIN_NAMESPACE
QueryPrivate::QueryPrivate(QueryBase *parent) : q_ptr(parent),
- joinClassName(QString::null), skip(-1), take(-1)
+ skip(-1), take(-1)
{
}
diff --git a/src/query.h b/src/query.h
index a14b845..1fb4796 100644
--- a/src/query.h
+++ b/src/query.h
@@ -26,12 +26,14 @@
#include
#include
#include
+#include
+#include
#include "query_p.h"
#include "database.h"
#include "databasemodel.h"
#include "tablesetbase_p.h"
-#include "sqlgeneratorbase_p.h"
+#include "generators/sqlgeneratorbase_p.h"
#include "querybase_p.h"
#include "wherephrase.h"
#include "tablemodel.h"
@@ -39,7 +41,7 @@
NUT_BEGIN_NAMESPACE
template
-class NUT_EXPORT Query : public QueryBase
+ class NUT_EXPORT Query : public QueryBase
{
QueryPrivate *d_ptr;
Q_DECLARE_PRIVATE(Query)
@@ -48,37 +50,43 @@ class NUT_EXPORT Query : public QueryBase
public:
Query(Database *database, TableSetBase *tableSet, bool autoDelete);
-
~Query();
- Query *join(const QString &tableName);
+ //ddl
Query *setWhere(WherePhrase where);
- Query *join(Table *c)
+ Query *join(const QString &className);
+ Query *join(Table *c);
+
+ template
+ Query *join()
{
- join(c->metaObject()->className());
+ join(TABLE::staticMetaObject.className());
return this;
}
-// Query *orderBy(QString fieldName, QString type);
- Query *skip(int &n);
- Query *take(int &n);
+ // Query *orderBy(QString fieldName, QString type);
+ Query *skip(int n);
+ Query *take(int n);
Query *orderBy(WherePhrase phrase);
Query *include(TableSetBase *t);
Query *include(Table *t);
- int count();
- QVariant max(FieldPhrase &f);
- QVariant min(FieldPhrase &f);
- QVariant average(FieldPhrase &f);
+ //data selecting
T *first();
- QList toList(int count = -1);
+ QList toList(int count = -1);
template
QList select(const FieldPhrase f);
+ int count();
+ QVariant max(const FieldPhrase &f);
+ QVariant min(const FieldPhrase &f);
+ QVariant average(const FieldPhrase &f);
+ //data mailpulation
int update(WherePhrase phrase);
int remove();
+ //debug purpose
QString sqlCommand() const;
};
@@ -98,9 +106,9 @@ Q_OUTOFLINE_TEMPLATE Query::Query(Database *database, TableSetBase *tableSet,
d->database = database;
d->tableSet = tableSet;
- d->tableName
- = // TableModel::findByClassName(T::staticMetaObject.className())->name();
- d->database->model()
+ d->className = T::staticMetaObject.className();
+ d->tableName =
+ d->database->model()
.tableByClassName(T::staticMetaObject.className())
->name();
}
@@ -109,110 +117,171 @@ template
Q_OUTOFLINE_TEMPLATE Query::~Query()
{
Q_D(Query);
-
delete d;
}
template
Q_OUTOFLINE_TEMPLATE QList Query::toList(int count)
{
+ Q_UNUSED(count);
Q_D(Query);
- QList result;
+ QList returnList;
d->select = "*";
- // QSqlQuery q =
- // d->database->exec(d->database->sqlGenertor()->selectCommand(d->wheres,
- // d->orders, d->tableName, d->joinClassName));
d->sql = d->database->sqlGenertor()->selectCommand(
- SqlGeneratorBase::SelectAll, "", d->wheres, d->orderPhrases,
- d->tableName, d->joinClassName, d->skip, d->take);
+ SqlGeneratorBase::SelectAll, "",
+ d->tableName,
+ d->wheres, d->orderPhrases, d->relations,
+ d->skip, d->take);
QSqlQuery q = d->database->exec(d->sql);
-
- // QString pk = TableModel::findByName(d->tableName)->primaryKey();
- QString pk = d->database->model().tableByName(d->tableName)->primaryKey();
- QVariant lastPkValue = QVariant();
- int childTypeId = 0;
- T *lastRow = 0;
- TableSetBase *childTableSet = Q_NULLPTR;
-
- // FIXME: getting table error
- // QStringList masterFields =
- // TableModel::findByName(d->tableName)->fieldsNames();
- QStringList masterFields
- = d->database->model().tableByName(d->tableName)->fieldsNames();
- QStringList childFields;
- if (!d->joinClassName.isNull()) {
- TableModel *joinTableModel
- = TableModel::findByClassName(d->joinClassName);
- if (joinTableModel) {
- // childFields =
- // d->database->model().modelByClass(d->joinClassName)->fieldsNames();
- childFields
- = TableModel::findByClassName(d->joinClassName)->fieldsNames();
- QString joinTableName = d->database->tableName(d->joinClassName);
- childTypeId = d->database->model().tableByName(joinTableName)->typeId();
- // childTypeId =
- // TableModel::findByName(joinTableName)->typeId();
- }
+ if (q.lastError().isValid()) {
+ qDebug() << q.lastError().text();
+ return returnList;
}
- while (q.next()) {
- if (lastPkValue != q.value(pk)) {
- T *t = new T();
- foreach (QString field, masterFields)
- t->setProperty(field.toLatin1().data(), q.value(field));
- // for (int i = 0; i < t->metaObject()->propertyCount();
- // i++) {
- // const QMetaProperty p =
- // t->metaObject()->property(i);
+ QSet relatedTables;
+ relatedTables << d->database->model().tableByName(d->tableName);
+ foreach (RelationModel *rel, d->relations)
+ relatedTables << rel->slaveTable << rel->masterTable;
- // p.write(t,
- // d->database->sqlGenertor()->readValue(p.type(),
- // q.value(p.name())));
- // }
- t->setTableSet(d->tableSet);
- t->setStatus(Table::FeatchedFromDB);
- t->setParent(this);
- t->clear();
+ struct LevelData{
+ QList masters;
+ QList slaves;
+ QList masterFields;
+ QString keyFiledname;
+ QVariant lastKeyValue;
+ TableModel *table;
+ Table *lastRow;
+ };
+ QVector levels;
+ QSet importedTables;
+ auto add_table = [&](int i, TableModel* table) {
+ if (importedTables.contains(table->name()))
+ return;
+ importedTables.insert(table->name());
- result.append(t);
- lastRow = t;
+ LevelData data;
+ data.table = table;
+ data.keyFiledname = data.table->name() + "." + data.table->primaryKey();
+ data.lastKeyValue = QVariant();
- if (childTypeId) {
- QSet tableSets = t->tableSets;
- foreach (TableSetBase *ts, tableSets)
- if (ts->childClassName() == d->joinClassName)
- childTableSet = ts;
+ QHash masters;
+ foreach (RelationModel *rel, d->relations)
+ if (rel->slaveTable->name() == table->name())
+ masters.insert(rel->masterTable->name(), rel->localProperty);
+
+ for (int j = 0; j < levels.count(); ++j) {
+ LevelData &dt = levels[j];
+
+ QHashIterator it(masters);
+ while (it.hasNext()) {
+ it.next();
+
+ if (dt.table->name() == it.key()) {
+ data.masters.append(j);
+ data.masterFields.append(it.value());
+ dt.slaves.append(i);
+ }
}
}
- if (childTypeId) {
- const QMetaObject *childMetaObject
- = QMetaType::metaObjectForType(childTypeId);
- Table *childTable
- = qobject_cast(childMetaObject->newInstance());
-
- foreach (QString field, childFields)
- childTable->setProperty(field.toLatin1().data(),
- q.value(field));
- // TODO: set database for table
- childTable->setParent(this);
- childTable->setParentTable(lastRow);
- childTable->setStatus(Table::FeatchedFromDB);
- childTable->setTableSet(childTableSet);
- childTable->clear();
- childTableSet->add(childTable);
- }
- lastPkValue = q.value(pk);
-
- if (!--count)
- break;
+ levels.append(data);
+ };
+ for (int i = 0; i < d->relations.count(); ++i) {
+ RelationModel *rel = d->relations[i];
+ add_table(i, rel->masterTable);
+ add_table(i, rel->slaveTable);
}
+ if (!importedTables.count()) {
+ LevelData data;
+ data.table = d->database->model().tableByName(d->tableName);
+ data.keyFiledname = d->tableName + "." + data.table->primaryKey();
+ data.lastKeyValue = QVariant();
+
+ levels.append(data);
+ }
+
+ QVector checked;
+ checked.reserve(levels.count());
+ for (int i = 0; i < levels.count(); ++i)
+ checked.append(false);
+
+ while (q.next()) {
+ checked.fill(false);
+
+ int p = levels.count();
+ int n = -1;
+ int lastP = p;
+
+ while (p) {
+ // Q_ASSERT(p != lastP);
+ // if (p == lastP)
+ // qFatal("NULL Loop detected");
+
+ n = (++n) % levels.count();
+ if (checked[n])
+ continue;
+ LevelData &data = levels[n];
+
+ // check if key value is changed
+ if (data.lastKeyValue == q.value(data.keyFiledname)) {
+ --p;
+ continue;
+ }
+
+ // check if master if current table has processed
+ foreach (int m, data.masters)
+ if (!checked[m])
+ continue;
+
+ checked[n] = true;
+ --p;
+ data.lastKeyValue = q.value(data.keyFiledname);
+
+ //create table row
+ Table *table;
+ if (data.table->className() == d->className) {
+ table = new T();
+ table->setParentTableSet(d->tableSet);
+ returnList.append(dynamic_cast(table));
+ } else {
+ const QMetaObject *childMetaObject
+ = QMetaType::metaObjectForType(data.table->typeId());
+ table = qobject_cast(childMetaObject->newInstance());
+
+ }
+
+ QStringList childFields = data.table->fieldsNames();
+ foreach (QString field, childFields)
+ table->setProperty(field.toLatin1().data(),
+ q.value(data.table->name() + "." + field));
+
+ for (int i = 0; i < data.masters.count(); ++i) {
+ int master = data.masters[i];
+ table->setProperty(data.masterFields[i].toLocal8Bit().data(),
+ QVariant::fromValue(levels[master].lastRow));
+
+ table->setParentTableSet(
+ levels[master].lastRow->childTableSet(
+ data.table->className()));
+ }
+
+ table->setStatus(Table::FeatchedFromDB);
+ table->setParent(this);
+ table->clear();
+
+ //set last created row
+ data.lastRow = table;
+
+ lastP = p;
+ } //while
+ } // while
if (m_autoDelete)
deleteLater();
- return result;
+
+ return returnList;
}
template
@@ -221,9 +290,12 @@ Q_OUTOFLINE_TEMPLATE QList Query::select(const FieldPhrase f)
{
Q_D(Query);
QList ret;
+
+ d->joins.prepend(d->tableName);
d->sql = d->database->sqlGenertor()->selectCommand(
- SqlGeneratorBase::SignleField, f.data()->text, d->wheres,
- d->orderPhrases, d->tableName, d->joinClassName, d->skip, d->take);
+ SqlGeneratorBase::SignleField, f.data()->text,
+ d->tableName, d->wheres,
+ d->orderPhrases, d->relations, d->skip, d->take);
QSqlQuery q = d->database->exec(d->sql);
@@ -240,7 +312,9 @@ Q_OUTOFLINE_TEMPLATE QList Query::select(const FieldPhrase f)
template
Q_OUTOFLINE_TEMPLATE T *Query::first()
{
- QList list = toList(1);
+ skip(0);
+ take(1);
+ QList list = toList(1);
if (list.count())
return list.first();
@@ -253,9 +327,14 @@ Q_OUTOFLINE_TEMPLATE int Query::count()
{
Q_D(Query);
+ d->joins.prepend(d->tableName);
d->select = "COUNT(*)";
d->sql = d->database->sqlGenertor()->selectCommand(SqlGeneratorBase::Count,
- QStringLiteral("*"), d->wheres, d->orderPhrases, d->tableName, d->joinClassName);
+ QStringLiteral("*"),
+ d->tableName,
+ d->wheres,
+ d->orderPhrases,
+ d->relations);
QSqlQuery q = d->database->exec(d->sql);
if (q.next())
@@ -264,13 +343,15 @@ Q_OUTOFLINE_TEMPLATE int Query::count()
}
template
-Q_OUTOFLINE_TEMPLATE QVariant Query::max(FieldPhrase &f)
+Q_OUTOFLINE_TEMPLATE QVariant Query::max(const FieldPhrase &f)
{
Q_D(Query);
+ d->joins.prepend(d->tableName);
d->sql = d->database->sqlGenertor()->selectCommand(
- SqlGeneratorBase::Max, f.data()->text, d->wheres, d->orderPhrases,
- d->tableName, d->joinClassName);
+ SqlGeneratorBase::Max, f.data()->text, d->tableName,
+ d->wheres, d->orderPhrases,
+ d->relations);
QSqlQuery q = d->database->exec(d->sql);
if (q.next())
@@ -279,13 +360,15 @@ Q_OUTOFLINE_TEMPLATE QVariant Query::max(FieldPhrase &f)
}
template
-Q_OUTOFLINE_TEMPLATE QVariant Query::min(FieldPhrase &f)
+Q_OUTOFLINE_TEMPLATE QVariant Query::min(const FieldPhrase &f)
{
Q_D(Query);
+ d->joins.prepend(d->tableName);
d->sql = d->database->sqlGenertor()->selectCommand(
- SqlGeneratorBase::Min, f.data()->text, d->wheres, d->orderPhrases,
- d->tableName, d->joinClassName);
+ SqlGeneratorBase::Min, f.data()->text, d->tableName,
+ d->wheres, d->orderPhrases,
+ d->relations);
QSqlQuery q = d->database->exec(d->sql);
if (q.next())
@@ -294,13 +377,15 @@ Q_OUTOFLINE_TEMPLATE QVariant Query::min(FieldPhrase &f)
}
template
-Q_OUTOFLINE_TEMPLATE QVariant Query::average(FieldPhrase &f)
+Q_OUTOFLINE_TEMPLATE QVariant Query::average(const FieldPhrase &f)
{
Q_D(Query);
+ d->joins.prepend(d->tableName);
d->sql = d->database->sqlGenertor()->selectCommand(
- SqlGeneratorBase::Average, f.data()->text, d->wheres, d->orderPhrases,
- d->tableName, d->joinClassName);
+ SqlGeneratorBase::Average, f.data()->text, d->tableName,
+ d->wheres, d->orderPhrases,
+ d->relations);
QSqlQuery q = d->database->exec(d->sql);
if (q.next())
@@ -309,10 +394,31 @@ Q_OUTOFLINE_TEMPLATE QVariant Query::average(FieldPhrase &f)
}
template
-Q_OUTOFLINE_TEMPLATE Query *Query::join(const QString &tableName)
+Q_OUTOFLINE_TEMPLATE Query *Query::join(const QString &className)
{
Q_D(Query);
- d->joinClassName = tableName;
+
+ RelationModel *rel = d->database->model()
+ .relationByClassNames(d->className, className);
+ if (!rel)
+ rel = d->database->model()
+ .relationByClassNames(className, d->className);
+
+ if (!rel) {
+ qInfo("No relation between %s and %s",
+ qPrintable(d->className), qPrintable(className));
+ return this;
+ }
+
+ d->relations.append(rel);
+ d->joins.append(className);
+ return this;
+}
+
+template
+Q_OUTOFLINE_TEMPLATE Query *Query::join(Table *c)
+{
+ join(c->metaObject()->className());
return this;
}
@@ -325,7 +431,7 @@ Q_OUTOFLINE_TEMPLATE Query *Query::setWhere(WherePhrase where)
}
template
-Q_OUTOFLINE_TEMPLATE Query *Query::skip(int &n)
+Q_OUTOFLINE_TEMPLATE Query *Query::skip(int n)
{
Q_D(Query);
d->skip = n;
@@ -333,7 +439,7 @@ Q_OUTOFLINE_TEMPLATE Query *Query::skip(int &n)
}
template
-Q_OUTOFLINE_TEMPLATE Query *Query::take(int &n)
+Q_OUTOFLINE_TEMPLATE Query *Query::take(int n)
{
Q_D(Query);
d->take = n;
@@ -361,7 +467,6 @@ template
Q_OUTOFLINE_TEMPLATE Query *Query::include(TableSetBase *t)
{
Q_D(Query);
- d->joinClassName = t->childClassName();
return this;
}
@@ -369,7 +474,6 @@ template
Q_OUTOFLINE_TEMPLATE Query *Query::include(Table *t)
{
Q_D(Query);
- d->joinClassName = t->metaObject()->className();
return this;
}
diff --git a/src/query_p.h b/src/query_p.h
index 8046c3c..4b48859 100644
--- a/src/query_p.h
+++ b/src/query_p.h
@@ -30,8 +30,8 @@ NUT_BEGIN_NAMESPACE
class Database;
class TableSetBase;
-//template
class QueryBase;
+class RelationModel;
class QueryPrivate{
QueryBase *q_ptr;
Q_DECLARE_PUBLIC(QueryBase)
@@ -41,11 +41,13 @@ public:
~QueryPrivate();
QString sql;
+ QString className;
QString tableName;
QString select;
Database *database;
TableSetBase *tableSet;
- QString joinClassName;
+ QStringList joins;
+ QList relations;
QList wheres;
QList orderPhrases;
QHash orders;
diff --git a/src/querybase.cpp b/src/querybase.cpp
index 56f93d0..5a9526d 100644
--- a/src/querybase.cpp
+++ b/src/querybase.cpp
@@ -1,5 +1,9 @@
#include "querybase_p.h"
+#include "table.h"
+#include "tablesetbase_p.h"
+
+
NUT_BEGIN_NAMESPACE
QueryBase::QueryBase(QObject *parent) : QObject(parent)
@@ -7,4 +11,9 @@ QueryBase::QueryBase(QObject *parent) : QObject(parent)
}
+void QueryBase::addTableToSet(TableSetBase *set, Table *table)
+{
+ set->add(table);
+}
+
NUT_END_NAMESPACE
diff --git a/src/querybase_p.h b/src/querybase_p.h
index c5f370d..4d53ce3 100644
--- a/src/querybase_p.h
+++ b/src/querybase_p.h
@@ -28,13 +28,16 @@
NUT_BEGIN_NAMESPACE
//TODO: remove this class
+class Table;
+class TableSetBase;
class QueryBase : public QObject
{
Q_OBJECT
public:
explicit QueryBase(QObject *parent = 0);
-signals:
+protected:
+ void addTableToSet(TableSetBase *set, Table *table);
public slots:
};
diff --git a/src/serializableobject.cpp b/src/serializableobject.cpp
new file mode 100644
index 0000000..667c57b
--- /dev/null
+++ b/src/serializableobject.cpp
@@ -0,0 +1,6 @@
+#include "serializableobject.h"
+
+SerializableObject::SerializableObject()
+{
+
+}
diff --git a/src/serializableobject.h b/src/serializableobject.h
new file mode 100644
index 0000000..ffc65b1
--- /dev/null
+++ b/src/serializableobject.h
@@ -0,0 +1,15 @@
+#ifndef SERIALIZABLEOBJECT_H
+#define SERIALIZABLEOBJECT_H
+
+#include
+
+class SerializableObject
+{
+public:
+ SerializableObject();
+
+ virtual void load(const QVariant &value) = 0;
+ virtual QVariant save() = 0;
+};
+
+#endif // SERIALIZABLEOBJECT_H
diff --git a/src/table.cpp b/src/table.cpp
index 75eb7bc..eeea6ec 100644
--- a/src/table.cpp
+++ b/src/table.cpp
@@ -22,52 +22,42 @@
#include
#include "table.h"
#include "database.h"
-#include "sqlgeneratorbase_p.h"
+#include "databasemodel.h"
+#include "generators/sqlgeneratorbase_p.h"
NUT_BEGIN_NAMESPACE
-Table::Table(QObject *parent) : QObject(parent)
+/*
+ * FIXME:
+ * Qt can not access metaObject inside of constructor
+ * so, if we can't initalize myModel inside of ctor. in
+ * other side myModel inited in propertyChanged signal, so
+ * any method that uses myModel (like: primaryKey, ...) can't
+ * be accessed before any property set. So ugly, but there are
+ * no other way for now.
+ *
+ * This should be fixed to v1.2
+ */
+
+Table::Table(QObject *parent) : QObject(parent), myModel(0)
{
setStatus(NewCreated);
}
void Table::add(TableSetBase *t)
{
- this->tableSets.insert(t);
+ this->childTableSets.insert(t);
}
QString Table::primaryKey() const
{
-// static QString ret = QString::null;
-
-// if(ret == QString::null){
-// for(int i = 0; i < metaObject()->classInfoCount(); i++){
-// QMetaClassInfo ci = metaObject()->classInfo(i);
-// QString ciName = ci.name();
-
-// if(ciName.startsWith(__nut_NAME_PERFIX))
-// ciName.remove(__nut_NAME_PERFIX);
-
-// if(ciName.contains(" ")){
-// QStringList parts = ciName.split(" ");
-// QString propName = parts.at(1);
-// if(propName == __nut_PRIMARY_KEY)
-// ret = parts.at(0);
-// }
-// }
-
-// if(ret == QString::null)
-// ret = "";
-// }
-
-// return ret;
- return TableModel::findByClassName(metaObject()->className())->primaryKey();
+ return myModel->primaryKey();
}
bool Table::isPrimaryKeyAutoIncrement() const
{
- return TableModel::findByClassName(metaObject()->className())->field(primaryKey())->isAutoIncrement;
+ return myModel->field(myModel->primaryKey())->isAutoIncrement;
}
@@ -78,14 +68,20 @@ QVariant Table::primaryValue() const
void Table::propertyChanged(QString propName)
{
- if(propName == primaryKey())
+ if (!myModel)
+ myModel = TableModel::findByClassName(metaObject()->className());
+
+ if (!myModel)
+ qFatal ("model for this class not found");
+
+ if (propName == primaryKey())
return;
_changedProperties.insert(propName);
- if(_status == FeatchedFromDB)
+ if (_status == FeatchedFromDB)
_status = Modified;
- if(_status == NewCreated)
+ if (_status == NewCreated)
_status = Added;
}
@@ -102,12 +98,12 @@ QSet Table::changedProperties() const
bool Table::setParentTable(Table *master)
{
QString masterClassName = master->metaObject()->className();
- TableModel *myModel = TableModel::findByClassName(metaObject()->className());
foreach (RelationModel *r, myModel->foregionKeys())
- if(r->className == masterClassName)
+ if(r->masterClassName == masterClassName)
{
- setProperty(QString(r->localColumn).toLatin1().data(), master->primaryValue());
+ setProperty(QString(r->localColumn).toLatin1().data(),
+ master->primaryValue());
_changedProperties.insert(r->localColumn);
return true;
}
@@ -115,15 +111,23 @@ bool Table::setParentTable(Table *master)
return false;
}
-TableSetBase *Table::tableSet() const
+TableSetBase *Table::parentTableSet() const
{
- return _tableSet;
+ return _parentTableSet;
}
-void Table::setTableSet(TableSetBase *parent)
+void Table::setParentTableSet(TableSetBase *parent)
{
- _tableSet = parent;
- _tableSet->add(this);
+ _parentTableSet = parent;
+ _parentTableSet->add(this);
+}
+
+TableSetBase *Table::childTableSet(const QString &name) const
+{
+ foreach (TableSetBase *t, childTableSets)
+ if (t->childClassName() == name)
+ return t;
+ return Q_NULLPTR;
}
int Table::save(Database *db)
@@ -133,7 +137,7 @@ int Table::save(Database *db)
if(status() == Added && isPrimaryKeyAutoIncrement())
setProperty(primaryKey().toLatin1().data(), q.lastInsertId());
- foreach(TableSetBase *ts, tableSets)
+ foreach(TableSetBase *ts, childTableSets)
ts->save(db);
setStatus(FeatchedFromDB);
diff --git a/src/table.h b/src/table.h
index da9f8cb..0262328 100644
--- a/src/table.h
+++ b/src/table.h
@@ -33,12 +33,13 @@ NUT_BEGIN_NAMESPACE
class Database;
class TableSetBase;
+class TableModel;
class NUT_EXPORT Table : public QObject
{
Q_OBJECT
public:
- explicit Table(QObject *tableSet = 0);
+ explicit Table(QObject *parentTableSet = 0);
enum Status{
NewCreated,
@@ -56,8 +57,10 @@ public:
Status status() const;
void setStatus(const Status &status);
- TableSetBase *tableSet() const;
- void setTableSet(TableSetBase *tableSet);
+ TableSetBase *parentTableSet() const;
+ void setParentTableSet(TableSetBase *parentTableSet);
+
+ TableSetBase *childTableSet(const QString &name) const;
QSet changedProperties() const;
@@ -70,11 +73,13 @@ protected:
void propertyChanged(QString propName);
private:
+ TableModel *myModel;
Status _status;
QSet _changedProperties;
- TableSetBase *_tableSet;
+ //TODO: is this removable?
+ TableSetBase *_parentTableSet;
- QSet tableSets;
+ QSet childTableSets;
void clear();
void add(TableSetBase *);
diff --git a/src/tablemodel.cpp b/src/tablemodel.cpp
index 7e3758a..8c272a2 100644
--- a/src/tablemodel.cpp
+++ b/src/tablemodel.cpp
@@ -30,8 +30,11 @@
NUT_BEGIN_NAMESPACE
+/*
+ * TODO: It may be good idea if we replace this QSet with two QHash!
+ * one for className search and another for typeId.
+ */
QSet TableModel::_allModels;
-//QMap TableScheema::scheemas;
QString TableModel::name() const
{
@@ -95,6 +98,9 @@ QSet TableModel::allModels()
return _allModels;
}
+/*
+ * This is not used anywhere
+ */
TableModel *TableModel::findByTypeId(int typeId)
{
foreach (TableModel *model, _allModels)
@@ -103,20 +109,18 @@ TableModel *TableModel::findByTypeId(int typeId)
return 0;
}
-//TableModel *TableModel::findByName(QString name)
-//{
-// foreach (TableModel *model, _allModels)
-// if(model->name() == name)
-// return model;
-// return 0;
-//}
-
+/**
+ * @brief TableModel::findByClassName
+ * Find a table model by class name
+ * @param className
+ * @return
+ */
TableModel *TableModel::findByClassName(QString className)
{
- foreach (TableModel *model, _allModels){
+ foreach (TableModel *model, _allModels)
if(model->className() == className)
return model;
- }
+
return 0;
}
@@ -144,6 +148,23 @@ bool TableModel::operator !=(const TableModel &t) const
return !(*this == t);
}
+bool TableModel::checkClassInfo(const QMetaClassInfo &classInfo,
+ QString &type, QString &name, QString &value)
+{
+ if (!QString(classInfo.name()).startsWith(__nut_NAME_PERFIX)) {
+ return false;
+ } else {
+ QStringList parts = QString(classInfo.value()).split("\n");
+ if (parts.count() != 3)
+ return false;
+
+ type = parts[0];
+ name = parts[1];
+ value = parts[2];
+ return true;
+ }
+}
+
TableModel::TableModel(int typeId, QString tableName)
{
//TODO: check that
@@ -163,20 +184,19 @@ TableModel::TableModel(int typeId, QString tableName)
// get fields names
for(int j = 0; j < tableMetaObject->classInfoCount(); j++){
- QString name = tableMetaObject->classInfo(j).name();
- name = name.replace("\"", "");
+ QString type;
+ QString name;
+ QString value;
- name = name.remove(__nut_NAME_PERFIX);
+ if (!checkClassInfo(tableMetaObject->classInfo(j),
+ type, name, value)) {
+ continue;
+ }
- if(name.contains(" ")){
- QStringList parts = name.split(" ");
- QString propName = parts.at(1);
-
- if(propName == __nut_FIELD){
- FieldModel *f = new FieldModel;
- f->name = parts.at(0);
- _fields.append(f);
- }
+ if(type == __nut_FIELD){
+ FieldModel *f = new FieldModel;
+ f->name = name;
+ _fields.append(f);
}
}
// Browse all fields
@@ -195,47 +215,48 @@ TableModel::TableModel(int typeId, QString tableName)
// Browse class infos
for(int j = 0; j < tableMetaObject->classInfoCount(); j++){
- QString name = tableMetaObject->classInfo(j).name();
- QString value = tableMetaObject->classInfo(j).value();
+ QString type;
+ QString name;
+ QString value;
- name = name.replace("\"", "").remove(__nut_NAME_PERFIX);
- value = value.replace("\"", "");
+ if (!checkClassInfo(tableMetaObject->classInfo(j),
+ type, name, value)) {
+ continue;
+ }
- if(name.contains(" ")){
- QStringList parts = name.split(" ");
- QString propName = parts.at(1);
+ if(type == __nut_FOREGION_KEY){
+ RelationModel *fk = new RelationModel;
+ fk->slaveTable = this;
+ fk->localColumn = name + "Id";
+ fk->localProperty = name;
+ fk->foregionColumn = value;
+ fk->masterClassName = value;
+ _foregionKeys.append(fk);
+ }
- if(propName == __nut_FOREGION_KEY){
- RelationModel *fk = new RelationModel;
- fk->localColumn = parts.at(0);
- fk->foregionColumn = value;
- fk->className = value;
- _foregionKeys.append(fk);
- }
-
- if(propName == __nut_FIELD){
-
- }
-
-
- FieldModel *f = field(parts.at(0));
- if(!f)
- continue;
-
- if(propName == __nut_LEN)
- f->length = value.toInt();
- else if(propName == __nut_NOT_NULL)
- f->notNull = true;
- else if(propName == __nut_DEFAULT_VALUE)
- f->defaultValue = value;
- else if(propName == __nut_PRIMARY_KEY)
- f->isPrimaryKey = true;
- else if(propName == __nut_AUTO_INCREMENT)
- f->isAutoIncrement = true;
- else if(propName == __nut_UNIQUE)
- f->isUnique = true;
+ if(type == __nut_FIELD){
}
+
+
+ FieldModel *f = field(name);
+ if(!f)
+ continue;
+
+ if(type == __nut_LEN)
+ f->length = value.toInt();
+ else if(type == __nut_NOT_NULL)
+ f->notNull = true;
+ else if(type == __nut_DEFAULT_VALUE)
+ f->defaultValue = value;
+ else if(type == __nut_PRIMARY_KEY)
+ f->isPrimaryKey = true;
+ else if(type == __nut_AUTO_INCREMENT)
+ f->isAutoIncrement = true;
+ else if(type == __nut_UNIQUE)
+ f->isUnique = true;
+
+
}
if(!findByTypeId(typeId) && !tableName.isNull())
@@ -321,41 +342,10 @@ QJsonObject TableModel::toJson() const
return obj;
}
-//TableScheema *TableScheema::registerTable(int typeId, QString tableName)
-//{
-// TableScheema *scheema = new TableScheema(typeId, tableName);
-// scheemas.insert(typeId, scheema);
-// return scheema;
-//}
-
-//void TableScheema::createForegionKeys()
-//{
-// foreach (TableScheema *sch, scheemas) {
-// foreach (ForegionKey *fk, sch->_foregionKeys) {
-// fk->table = scheema(fk->tableName);
-// }
-// }
-//}
-
-//TableModel *TableModel::model(QString className)
-//{
-// qFatal("");
-//#ifdef NUT_NAMESPACE
-// if(className.startsWith(QT_STRINGIFY(NUT_NAMESPACE) "::"))
-// className = className.replace(QT_STRINGIFY(NUT_NAMESPACE) "::", "");
-//#endif
-
-// foreach (TableModel *s, _allModels)
-// if(s->_className == className){
-// return s;
-// }
-// return 0;
-//}
-
RelationModel *TableModel::foregionKey(QString otherTable) const
{
foreach (RelationModel *fk, _foregionKeys)
- if(fk->className == otherTable)
+ if(fk->masterClassName == otherTable)
return fk;
return 0;
diff --git a/src/tablemodel.h b/src/tablemodel.h
index 700032e..42615e5 100644
--- a/src/tablemodel.h
+++ b/src/tablemodel.h
@@ -65,10 +65,15 @@ struct FieldModel{
};
struct RelationModel{
- QString className;
+ //slave
QString localColumn;
- TableModel *table;
+ QString localProperty;
+ TableModel *slaveTable;
+ //master
QString foregionColumn;
+ TableModel *masterTable;
+
+ QString masterClassName;
};
class TableModel
{
@@ -117,6 +122,8 @@ private:
QList
ChangeLogTable
-
-
- 
Public Types inherited from 
-
- 
-
- 
-
- 
-
- 
-
- 
-
- 
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-