adjust code extraction for 0.4.0 version (#17)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pg_wire"
-version = "0.3.1"
+version = "0.4.0"
 description = "Server Side implementation of PostgreSQL Wire Protocol"
 license = "Apache-2.0"
 repository = "https://github.com/alex-dukhno/pg_wire"

src/lib.rs

@@ -20,7 +20,7 @@ pub use hand_shake::{Process as HandShakeProcess, Request as HandShakeRequest, S
 pub use message_decoder::{MessageDecoder, Status as MessageDecoderStatus};
 pub use messages::{BackendMessage, ColumnMetadata, FrontendMessage};
 pub use result::{Error, Result};
-pub use types::{NotSupportedOid, PgType, Value};
+pub use types::{PgType, Value};
 
 mod cursor;
 mod format;

src/messages.rs

@@ -77,7 +77,7 @@ pub enum FrontendMessage {
         sql: String,
         /// The number of specified parameter data types can be less than the
         /// number of parameters specified in the query.
-        param_types: Vec<u32>,
+        param_types: Vec<PgType>,
     },
 
     /// Describe an existing prepared statement.
@@ -375,11 +375,11 @@ pub struct ColumnMetadata {
 
 impl ColumnMetadata {
     /// Creates new column metadata
-    pub fn new<S: ToString>(name: S, type_id: u32, type_size: i16) -> ColumnMetadata {
+    pub fn new<S: ToString>(name: S, pg_type: PgType) -> ColumnMetadata {
         Self {
             name: name.to_string(),
-            type_id,
-            type_size,
+            type_id: pg_type.type_oid(),
+            type_size: pg_type.type_len(),
         }
     }
 }
@@ -470,7 +470,7 @@ fn decode_parse(mut cursor: Cursor) -> Result<FrontendMessage> {
 
     let mut param_types = vec![];
     for _ in 0..cursor.read_i16()? {
-        let oid = cursor.read_u32()?;
+        let oid = PgType::try_from(cursor.read_u32()?)?;
         log::trace!("OID {:?}", oid);
         param_types.push(oid);
     }
@@ -613,7 +613,7 @@ mod decoding_frontend_messages {
             Ok(FrontendMessage::Parse {
                 statement_name: "".to_owned(),
                 sql: "select * from schema_name.table_name where si_column = $1;".to_owned(),
-                param_types: vec![23],
+                param_types: vec![PgType::Integer],
             })
         );
     }
@@ -726,7 +726,7 @@ mod serializing_backend_messages {
     #[test]
     fn row_description() {
         assert_eq!(
-            BackendMessage::RowDescription(vec![ColumnMetadata::new("c1".to_owned(), 23, 4)]).as_vec(),
+            BackendMessage::RowDescription(vec![ColumnMetadata::new("c1".to_owned(), PgType::Integer)]).as_vec(),
             vec![
                 ROW_DESCRIPTION,
                 0,

src/result.rs

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use crate::types::NotSupportedOid;
+
 /// Protocol operation result
 pub type Result<T> = std::result::Result<T, Error>;
 
@@ -37,3 +39,9 @@ pub enum Error {
     /// Indicates that connection verification is failed
     VerificationFailed,
 }
+
+impl From<NotSupportedOid> for Error {
+    fn from(error: NotSupportedOid) -> Error {
+        Error::InvalidInput(error.to_string())
+    }
+}

src/types.rs

@@ -19,7 +19,7 @@ use std::{
 };
 
 /// Represents PostgreSQL data type and methods to send over wire
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Clone, Copy)]
 pub enum PgType {
     /// Represents PostgreSQL `smallint` data type
     SmallInt,
@@ -132,6 +132,12 @@ impl TryFrom<Oid> for PgType {
     }
 }
 
+impl Display for NotSupportedOid {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        write!(f, "{} OID is not supported", self.0)
+    }
+}
+
 fn parse_bigint_from_binary(buf: &mut Cursor) -> Result<Value, String> {
     let v = match buf.read_i64() {
         Ok(v) => v,