[fdo-commits] r2560 - in trunk/Providers/GenericRdbms/Src:
MySQL/SchemaMgr/Ph ODBC/SchemaMgr/Ph
svn_fdo at osgeo.org
svn_fdo at osgeo.org
Tue Feb 20 13:57:08 EST 2007
Author: jacklee
Date: 2007-02-20 13:57:08 -0500 (Tue, 20 Feb 2007)
New Revision: 2560
Modified:
trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/Owner.cpp
trunk/Providers/GenericRdbms/Src/ODBC/SchemaMgr/Ph/Owner.cpp
Log:
FDORDBMS_496 - FDORDBMS_504 should have the single quote characters escaped.
Modified: trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/Owner.cpp
===================================================================
--- trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/Owner.cpp 2007-02-20 18:54:53 UTC (rev 2559)
+++ trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/Owner.cpp 2007-02-20 18:57:08 UTC (rev 2560)
@@ -647,67 +647,67 @@
sql_stmt = FdoStringP::Format(L"insert into f_classdefinition "
L"(classname,schemaname,tablename,classtype,description,isabstract,parentclassname,istablecreator, isfixedtable, hasversion, haslock) "
- L"values ('Class', 'F_MetaClass', ' ', 1, '%ls', 0, 'ClassDefinition', 0, 1, 0, 0)",
- NlsMsgGet(FDORDBMS_504, "Non-feature metaclass"));
+ L"values ('Class', 'F_MetaClass', ' ', 1, %ls, 0, 'ClassDefinition', 0, 1, 0, 0)",
+ (FdoString *) GetManager()->FormatSQLVal(NlsMsgGet(FDORDBMS_504, "Non-feature metaclass"), FdoSmPhColType_String));
gdbiConn->ExecuteNonQuery( (const char*) sql_stmt);
sql_stmt = FdoStringP::Format(L"insert into f_classdefinition "
L"(classname, schemaname, tablename,classtype, description, isabstract, parentclassname, istablecreator, isfixedtable, hasversion, haslock) "
- L"values ('ClassDefinition', 'F_MetaClass', 'f_classdefinition', 1, '%ls', 1, null, 0, 1, 0, 0) ",
- NlsMsgGet(FDORDBMS_496, "Base for all metaclasses"));
+ L"values ('ClassDefinition', 'F_MetaClass', 'f_classdefinition', 1, %ls, 1, null, 0, 1, 0, 0) ",
+ (FdoString *) GetManager()->FormatSQLVal(NlsMsgGet(FDORDBMS_496, "Base for all metaclasses"), FdoSmPhColType_String));
gdbiConn->ExecuteNonQuery( (const char*) sql_stmt);
sql_stmt = FdoStringP::Format(L"insert into f_attributedefinition "
L"(tablename, classid, columnname, attributename, columntype, columnsize, columnscale, attributetype, isnullable, "
L"isfeatid, issystem, isreadonly, isautogenerated, isrevisionnumber, owner, description, iscolumncreator, isfixedcolumn) "
L"values('f_classdefinition', LAST_INSERT_ID(), 'classname', 'ClassName', 'CHAR', 30, 0, 'string', 0, 0, 1, 1, 0, 0,"
- L"substring_index(current_user(), _utf8'@', 1), '%ls', 0, 1)",
- NlsMsgGet(FDORDBMS_497, "FDO base property: object class name"));
+ L"substring_index(current_user(), _utf8'@', 1), %ls, 0, 1)",
+ (FdoString *) GetManager()->FormatSQLVal(NlsMsgGet(FDORDBMS_497, "FDO base property: object class name"), FdoSmPhColType_String));
gdbiConn->ExecuteNonQuery( (const char*) sql_stmt);
sql_stmt = FdoStringP::Format(L"insert into f_attributedefinition "
L"(tablename, classid, columnname, attributename, columntype, columnsize, columnscale, attributetype, isnullable, "
L"isfeatid, issystem, isreadonly, isautogenerated, isrevisionnumber, owner, description, iscolumncreator, isfixedcolumn) "
L"values('f_classdefinition', LAST_INSERT_ID(), 'schemaname', 'SchemaName', 'CHAR', 255, 0, 'string', 1, 0, 1, 1, 0, 0,"
- L"substring_index(current_user(), _utf8'@', 1), '%ls', 0, 1)",
- NlsMsgGet(FDORDBMS_498, "FDO base property: object class schema name"));
+ L"substring_index(current_user(), _utf8'@', 1), %ls, 0, 1)",
+ (FdoString *) GetManager()->FormatSQLVal(NlsMsgGet(FDORDBMS_498, "FDO base property: object class schema name"), FdoSmPhColType_String));
gdbiConn->ExecuteNonQuery( (const char*) sql_stmt);
sql_stmt = FdoStringP::Format(L"insert into f_classdefinition "
L"(classname,schemaname,tablename,classtype,description,isabstract,parentclassname,istablecreator,isfixedtable,hasversion,haslock) "
- L"values ('Feature','F_MetaClass','f_feature',1,'%ls',0,'ClassDefinition',0,1,0,0)",
- NlsMsgGet(FDORDBMS_499, "Feature metaclass"));
+ L"values ('Feature','F_MetaClass','f_feature',1,%ls,0,'ClassDefinition',0,1,0,0)",
+ (FdoString *) GetManager()->FormatSQLVal(NlsMsgGet(FDORDBMS_499, "Feature metaclass"), FdoSmPhColType_String));
gdbiConn->ExecuteNonQuery( (const char*) sql_stmt);
sql_stmt = FdoStringP::Format(L"insert into f_attributedefinition "
L"(tablename,classid,columnname,attributename,idposition,columntype,columnsize,columnscale,attributetype,"
L"isnullable,isfeatid,issystem,isreadonly,isautogenerated,isrevisionnumber,owner,description,iscolumncreator,isfixedcolumn) "
L"values ('f_feature',LAST_INSERT_ID(),'featid','FeatId',1,'BIGINT',0,0,'int64',0,1,1,1,1,0, "
- L"substring_index(current_user(), _utf8'@',1),'%ls',0,1)",
- NlsMsgGet(FDORDBMS_500, "Feature id number (uniquely identifies a feature)"));
+ L"substring_index(current_user(), _utf8'@',1),%ls,0,1)",
+ (FdoString *) GetManager()->FormatSQLVal(NlsMsgGet(FDORDBMS_500, "Feature id number (uniquely identifies a feature)"), FdoSmPhColType_String));
gdbiConn->ExecuteNonQuery( (const char*) sql_stmt);
sql_stmt = FdoStringP::Format(L"insert into f_attributedefinition "
L"(tablename,classid,columnname,attributename,idposition,columntype,columnsize,columnscale,attributetype, "
L"isnullable,isfeatid,issystem,isreadonly,isautogenerated,isrevisionnumber,owner,description,iscolumncreator,isfixedcolumn) "
L"values ('f_feature',LAST_INSERT_ID(),'classid','ClassId',1,'BIGINT',0,0,'int64',0,0,1,1,1,0, "
- L"substring_index(current_user(), _utf8'@',1),'%ls',0,1)",
- NlsMsgGet(FDORDBMS_501, "Class id number (uniquely identifies a class)"));
+ L"substring_index(current_user(), _utf8'@',1),%ls,0,1)",
+ (FdoString *) GetManager()->FormatSQLVal(NlsMsgGet(FDORDBMS_501, "Class id number (uniquely identifies a class)"), FdoSmPhColType_String));
gdbiConn->ExecuteNonQuery( (const char*) sql_stmt);
sql_stmt = FdoStringP::Format(L"insert into f_attributedefinition "
L"(tablename,classid,columnname,attributename,columntype,columnsize,columnscale,attributetype, "
L"isnullable,isfeatid,issystem,isreadonly,isautogenerated,isrevisionnumber,owner,description,iscolumncreator,isfixedcolumn) "
L"values ('f_feature',LAST_INSERT_ID(),'revisionnumber','RevisionNumber','BIGINT',0,0,'double',0,0,1,1,1,1, "
- L"substring_index(current_user(), _utf8'@',1),'%ls',0,1)",
- NlsMsgGet(FDORDBMS_502, "Edit count for supporting optimistic locking. This value is incremented everytime the object is updated."));
+ L"substring_index(current_user(), _utf8'@',1),%ls,0,1)",
+ (FdoString *) GetManager()->FormatSQLVal(NlsMsgGet(FDORDBMS_502, "Edit count for supporting optimistic locking. This value is incremented everytime the object is updated."), FdoSmPhColType_String));
gdbiConn->ExecuteNonQuery( (const char*) sql_stmt);
sql_stmt = FdoStringP::Format(L"insert into f_attributedefinition "
L"(tablename,classid,columnname,attributename,columntype,columnsize,columnscale,attributetype,geometrytype,isnullable, "
L"isfeatid,issystem,isreadonly,isautogenerated,isrevisionnumber,owner,description,iscolumncreator,isfixedcolumn) "
L"values ('n/a',LAST_INSERT_ID(),'n/a','Bounds','GEOMETRY',0,0,'4','84224',1,0,1,1,0,0, "
- L"substring_index(current_user(), _utf8'@',1),'%ls', 0, 0)",
- NlsMsgGet(FDORDBMS_503, "Bounding box for the feature"));
+ L"substring_index(current_user(), _utf8'@',1),%ls, 0, 0)",
+ (FdoString *) GetManager()->FormatSQLVal(NlsMsgGet(FDORDBMS_503, "Bounding box for the feature"), FdoSmPhColType_String));
gdbiConn->ExecuteNonQuery( (const char*) sql_stmt);
}
\ No newline at end of file
Modified: trunk/Providers/GenericRdbms/Src/ODBC/SchemaMgr/Ph/Owner.cpp
===================================================================
--- trunk/Providers/GenericRdbms/Src/ODBC/SchemaMgr/Ph/Owner.cpp 2007-02-20 18:54:53 UTC (rev 2559)
+++ trunk/Providers/GenericRdbms/Src/ODBC/SchemaMgr/Ph/Owner.cpp 2007-02-20 18:57:08 UTC (rev 2560)
@@ -255,68 +255,68 @@
sql_stmt = FdoStringP::Format(L"insert into f_classdefinition "
L"(classname,schemaname,tablename,classtype,description,isabstract,parentclassname,istablecreator,isfixedtable,hasversion,haslock) "
- L"values ('Class', 'F_MetaClass', ' ', 1, '%ls', 0, 'ClassDefinition', 0, 1, 0, 0)",
- NlsMsgGet(FDORDBMS_504, "Non-feature metaclass"));
+ L"values ('Class', 'F_MetaClass', ' ', 1, %ls, 0, 'ClassDefinition', 0, 1, 0, 0)",
+ (FdoString *) GetManager()->FormatSQLVal(NlsMsgGet(FDORDBMS_504, "Non-feature metaclass"), FdoSmPhColType_String));
gdbiConn->ExecuteNonQuery( (const char*) sql_stmt);
sql_stmt = FdoStringP::Format(L"insert into f_classdefinition "
L"(classname, schemaname, tablename,classtype, description, isabstract, parentclassname, istablecreator, isfixedtable, hasversion, haslock) "
- L"values('ClassDefinition', 'F_MetaClass', 'f_classdefinition', 1, '%ls', 1, null, 0, 1, 0, 0)",
- NlsMsgGet(FDORDBMS_496, "Base for all metaclasses"));
+ L"values('ClassDefinition', 'F_MetaClass', 'f_classdefinition', 1, %ls, 1, null, 0, 1, 0, 0)",
+ (FdoString *) GetManager()->FormatSQLVal(NlsMsgGet(FDORDBMS_496, "Base for all metaclasses"), FdoSmPhColType_String));
gdbiConn->ExecuteNonQuery( (const char*) sql_stmt);
sql_stmt = FdoStringP::Format(L"insert into f_attributedefinition "
L"(tablename, classid, columnname, attributename, columntype, columnsize, columnscale, attributetype, isnullable,"
L"isfeatid, issystem, isreadonly, isautogenerated, isrevisionnumber, owner, description, iscolumncreator, isfixedcolumn) "
L"values ('f_classdefinition', IDENT_CURRENT('f_classdefinition'), 'classname', 'ClassName', 'CHAR', 30, 0, 'string', 0, 0, 1, 1, 0, 0,"
- L"SYSTEM_USER, '%ls', 0, 1)",
- NlsMsgGet(FDORDBMS_497, "FDO base property: object class name"));
+ L"SYSTEM_USER, %ls, 0, 1)",
+ (FdoString *) GetManager()->FormatSQLVal(NlsMsgGet(FDORDBMS_497, "FDO base property: object class name"), FdoSmPhColType_String));
gdbiConn->ExecuteNonQuery( (const char*) sql_stmt);
sql_stmt = FdoStringP::Format(L"insert into f_attributedefinition "
L"(tablename, classid, columnname, attributename, columntype, columnsize, columnscale, attributetype, isnullable,"
L"isfeatid, issystem, isreadonly, isautogenerated, isrevisionnumber, owner, description, iscolumncreator, isfixedcolumn) "
L"values ('f_classdefinition', IDENT_CURRENT('f_classdefinition'), 'schemaname', 'SchemaName', 'CHAR', 255, 0, 'string', 1, 0, 1, 1, 0, 0,"
- L"SYSTEM_USER, '%ls', 0, 1)",
- NlsMsgGet(FDORDBMS_498, "FDO base property: object class schema name"));
+ L"SYSTEM_USER, %ls, 0, 1)",
+ (FdoString *) GetManager()->FormatSQLVal(NlsMsgGet(FDORDBMS_498, "FDO base property: object class schema name"), FdoSmPhColType_String));
gdbiConn->ExecuteNonQuery( (const char*) sql_stmt);
sql_stmt = FdoStringP::Format(L"insert into f_classdefinition "
L"(classname,schemaname,tablename,classtype,description,isabstract,parentclassname,istablecreator,isfixedtable,hasversion,haslock) "
- L"values ('Feature','F_MetaClass','f_feature',1,'%ls',0,'ClassDefinition',0,1,0,0)",
- NlsMsgGet(FDORDBMS_499, "Feature metaclass"));
+ L"values ('Feature','F_MetaClass','f_feature',1,%ls,0,'ClassDefinition',0,1,0,0)",
+ (FdoString *) GetManager()->FormatSQLVal(NlsMsgGet(FDORDBMS_499, "Feature metaclass"), FdoSmPhColType_String));
gdbiConn->ExecuteNonQuery( (const char*) sql_stmt);
sql_stmt = FdoStringP::Format(L"insert into f_attributedefinition "
L"(tablename,classid,columnname,attributename,idposition,columntype,columnsize,columnscale,attributetype,"
L"isnullable,isfeatid,issystem,isreadonly,isautogenerated,isrevisionnumber,owner,description,iscolumncreator,isfixedcolumn) "
L"values ('f_feature',IDENT_CURRENT('f_classdefinition'),'featid','FeatId',1,'NUMBER',20,0,'int64',0,1,1,1,1,0, "
- L"SYSTEM_USER,'%ls',0,1)",
- NlsMsgGet(FDORDBMS_500, "Feature id number (uniquely identifies a feature)"));
+ L"SYSTEM_USER,%ls,0,1)",
+ (FdoString *) GetManager()->FormatSQLVal(NlsMsgGet(FDORDBMS_500, "Feature id number (uniquely identifies a feature)"), FdoSmPhColType_String));
gdbiConn->ExecuteNonQuery( (const char*) sql_stmt);
sql_stmt = FdoStringP::Format(L"insert into f_attributedefinition "
L"(tablename,classid,columnname,attributename,idposition,columntype,columnsize,columnscale,attributetype, "
L"isnullable,isfeatid,issystem,isreadonly,isautogenerated,isrevisionnumber,owner,description,iscolumncreator,isfixedcolumn) "
L"values ('f_feature',IDENT_CURRENT('f_classdefinition'),'classid','ClassId',1,'NUMBER',20,0,'int64',0,0,1,1,1,0, "
- L"SYSTEM_USER,'%ls',0,1)",
- NlsMsgGet(FDORDBMS_501, "Class id number (uniquely identifies a class)"));
+ L"SYSTEM_USER,%ls,0,1)",
+ (FdoString *) GetManager()->FormatSQLVal(NlsMsgGet(FDORDBMS_501, "Class id number (uniquely identifies a class)"), FdoSmPhColType_String));
gdbiConn->ExecuteNonQuery( (const char*) sql_stmt);
sql_stmt = FdoStringP::Format(L"insert into f_attributedefinition "
L"(tablename,classid,columnname,attributename,columntype,columnsize,columnscale,attributetype, "
L"isnullable,isfeatid,issystem,isreadonly,isautogenerated,isrevisionnumber,owner,description,iscolumncreator,isfixedcolumn) "
L"values ('f_feature',IDENT_CURRENT('f_classdefinition'),'revisionnumber','RevisionNumber','NUMBER',0,0,'double',0,0,1,1,1,1, "
- L"SYSTEM_USER,'%ls',0,1)",
- NlsMsgGet(FDORDBMS_502, "Edit count for supporting optimistic locking. This value is incremented everytime the object is updated."));
+ L"SYSTEM_USER,%ls,0,1)",
+ (FdoString *) GetManager()->FormatSQLVal(NlsMsgGet(FDORDBMS_502, "Edit count for supporting optimistic locking. This value is incremented everytime the object is updated."), FdoSmPhColType_String));
gdbiConn->ExecuteNonQuery( (const char*) sql_stmt);
sql_stmt = FdoStringP::Format(L"insert into f_attributedefinition "
L"(tablename,classid,columnname,attributename,columntype,columnsize,columnscale,attributetype,geometrytype,isnullable, "
L"isfeatid,issystem,isreadonly,isautogenerated,isrevisionnumber,owner,description,iscolumncreator,isfixedcolumn) "
L"values ('n/a',IDENT_CURRENT('f_classdefinition'),'n/a','Bounds','GEOMETRY',0,0,'4','84224',1,0,1,1,0,0, "
- L"SYSTEM_USER,'%ls',0,0)",
- NlsMsgGet(FDORDBMS_503, "Bounding box for the feature"));
+ L"SYSTEM_USER,%ls,0,0)",
+ (FdoString *) GetManager()->FormatSQLVal(NlsMsgGet(FDORDBMS_503, "Bounding box for the feature"), FdoSmPhColType_String));
gdbiConn->ExecuteNonQuery( (const char*) sql_stmt);
}
More information about the fdo-commits
mailing list