Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
lcgcool
cool
Commits
57ffd017
Commit
57ffd017
authored
May 26, 2020
by
Charles Delort
Browse files
more fixes
parent
857a0f34
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/CoolKernel/src/StorageType.cpp
View file @
57ffd017
...
...
@@ -59,7 +59,7 @@ const std::type_info& cool::StorageType::cppType() const
case
StorageType
::
TypeId
::
String16M
:
return
typeid
(
cool
::
String16M
);
case
StorageType
::
TypeId
::
Blob64k
:
return
typeid
(
cool
::
Blob64k
);
case
StorageType
::
TypeId
::
Blob16M
:
return
typeid
(
cool
::
Blob16M
);
case
StorageType
::
TypeId
::
Blob128M
:
return
typeid
(
cool
::
Blob128M
);
case
StorageType
::
TypeId
::
Blob128M
:
return
typeid
(
cool
::
Blob128M
);
}
std
::
stringstream
out
;
out
<<
"PANIC! Unknown type '"
<<
m_id
<<
"' in StorageType::cppType()"
;
...
...
src/CoolKernel/tests/Record/test_Record.cpp
View file @
57ffd017
...
...
@@ -62,7 +62,7 @@ public:
Record
rec
(
spec
);
UInt32
size
=
rec
.
specification
().
size
();
CPPUNIT_ASSERT_EQUAL_MESSAGE
(
"Specification size"
,
(
UInt32
)
1
6
,
size
);
(
"Specification size"
,
(
UInt32
)
1
7
,
size
);
for
(
unsigned
i
=
0
;
i
<
size
;
i
++
)
{
std
::
stringstream
out
;
...
...
src/CoolKernel/tests/RecordSelection/test_RecordSelection.cpp
View file @
57ffd017
...
...
@@ -89,6 +89,12 @@ public:
CPPUNIT_ASSERT_THROW
(
FieldSelection
(
"S"
,
StorageType
::
TypeId
::
Blob16M
,
FieldSelection
::
Relation
::
LT
,
"hotzplotz"
),
Exception
);
CPPUNIT_ASSERT_THROW
(
FieldSelection
(
"S"
,
StorageType
::
TypeId
::
Blob16M
,
FieldSelection
::
Relation
::
GE
,
"hotzplotz"
),
Exception
);
CPPUNIT_ASSERT_THROW
(
FieldSelection
(
"S"
,
StorageType
::
TypeId
::
Blob16M
,
FieldSelection
::
Relation
::
LE
,
"hotzplotz"
),
Exception
);
// check Blob128M initialization
CPPUNIT_ASSERT_THROW
(
FieldSelection
(
"S"
,
StorageType
::
TypeId
::
Blob128M
,
FieldSelection
::
Relation
::
GT
,
"hotzplotz"
),
Exception
);
CPPUNIT_ASSERT_THROW
(
FieldSelection
(
"S"
,
StorageType
::
TypeId
::
Blob128M
,
FieldSelection
::
Relation
::
LT
,
"hotzplotz"
),
Exception
);
CPPUNIT_ASSERT_THROW
(
FieldSelection
(
"S"
,
StorageType
::
TypeId
::
Blob128M
,
FieldSelection
::
Relation
::
GE
,
"hotzplotz"
),
Exception
);
CPPUNIT_ASSERT_THROW
(
FieldSelection
(
"S"
,
StorageType
::
TypeId
::
Blob128M
,
FieldSelection
::
Relation
::
LE
,
"hotzplotz"
),
Exception
);
// some wrong types
CPPUNIT_ASSERT_THROW
(
FieldSelection
(
"S"
,
StorageType
::
TypeId
::
String4k
,
FieldSelection
::
Relation
::
EQ
,
(
Int32
)
5
),
Exception
);
...
...
src/PyCoolUtilities/python/PyCoolReferenceDb/__init__.py
View file @
57ffd017
...
...
@@ -717,8 +717,6 @@ class ReferenceDbMgr:
data
.
attribute
(
'A_BLOB64K'
).
setNull
(
True
)
if
self
.
refSchemaVersion220
:
# NEW 2.2.0 SCHEMA ONLY
data
.
attribute
(
'A_BLOB16M'
).
setNull
(
True
)
if
self
.
refSchemaVersion330
:
# NEW 3.3.0 SCHEMA ONLY
data
[
'A_BLOB128M'
]
=
None
if
self
.
refSchemaVersion330
:
# NEW 3.3.0 SCHEMA ONLY
data
.
attribute
(
'A_BLOB128M'
).
setNull
(
True
)
return
data
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment